[PR PATCH] New package: Opencoarrays-2.9.2

[PR PATCH] New package: Opencoarrays-2.9.2

[ramos]

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

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

https://github.com/ramos/void-packages master
https://github.com/void-linux/void-packages/pull/27618

New package: Opencoarrays-2.9.2


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

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

From 304b7768c2029afd455182cca9e9cb45e7523693 Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sat, 2 Jan 2021 11:09:03 +0100
Subject: [PATCH] New package: Opencoarrays-2.9.2

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
new file mode 100644
index 00000000000..1dd0b170662
--- /dev/null
+++ b/srcpkgs/OpenCoarrays/template
@@ -0,0 +1,15 @@
+# Template file for 'OpenCoarrays'
+pkgname=OpenCoarrays
+version=2.9.2
+revision=1
+build_style=cmake
+short_desc="OpenCoarray fortran PAGS paralellization library"
+maintainer="Alberto Ramos <alberto.ramos@ific.uv.es>"
+hostdepends="gcc gcc-fortran openmpi openmpi-devel cmake"
+makedepends="gcc gcc-fortran openmpi openmpi-devel cmake"
+depends="gcc gcc-fortran openmpi openmpi-devel cmake"
+license="GPL-3.0-or-later"
+homepage="http://www.opencoarrays.org/"
+distfiles="https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.9.2/OpenCoarrays-${version}.tar.gz"
+checksum=6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7
+

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-757190498

Comment:
Get rid of line 15 to pass Link check.

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-757190498

Comment:
Get rid of line 15 to pass Lint check.

Re: [PR PATCH] [Updated] New package: Opencoarrays-2.9.2

[ramos]

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

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

https://github.com/ramos/void-packages master
https://github.com/void-linux/void-packages/pull/27618

New package: Opencoarrays-2.9.2


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

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

From 304b7768c2029afd455182cca9e9cb45e7523693 Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sat, 2 Jan 2021 11:09:03 +0100
Subject: [PATCH 1/2] New package: Opencoarrays-2.9.2

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
new file mode 100644
index 00000000000..1dd0b170662
--- /dev/null
+++ b/srcpkgs/OpenCoarrays/template
@@ -0,0 +1,15 @@
+# Template file for 'OpenCoarrays'
+pkgname=OpenCoarrays
+version=2.9.2
+revision=1
+build_style=cmake
+short_desc="OpenCoarray fortran PAGS paralellization library"
+maintainer="Alberto Ramos <alberto.ramos@ific.uv.es>"
+hostdepends="gcc gcc-fortran openmpi openmpi-devel cmake"
+makedepends="gcc gcc-fortran openmpi openmpi-devel cmake"
+depends="gcc gcc-fortran openmpi openmpi-devel cmake"
+license="GPL-3.0-or-later"
+homepage="http://www.opencoarrays.org/"
+distfiles="https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.9.2/OpenCoarrays-${version}.tar.gz"
+checksum=6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7
+

From 3fb3372c0d50c7a3be309a5cbbfcb000ccc30345 Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sat, 16 Jan 2021 11:01:23 +0100
Subject: [PATCH 2/2] OpenCoarrays: Removed empty line to pass LINT test

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
index 1dd0b170662..97a6f625b69 100644
--- a/srcpkgs/OpenCoarrays/template
+++ b/srcpkgs/OpenCoarrays/template
@@ -12,4 +12,3 @@ license="GPL-3.0-or-later"
 homepage="http://www.opencoarrays.org/"
 distfiles="https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.9.2/OpenCoarrays-${version}.tar.gz"
 checksum=6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7
-

Re: [PR REVIEW] New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#discussion_r558835584

Comment:
`hostmakedepends`, -devel things should go in `makedepends`. The `build_style` is `cmake`, no need to include `cmake` in `hostmakedepends` or in `makedepends`. Looking at the project, you might want `openmpi-devel` for the development files in `makedepends`.

Re: [PR REVIEW] New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#discussion_r558835683

Comment:
The license is actually a BSD 3 Clause license, change to `license="BSD-3-Clause"`, and add
```
post_install() {
    vlicense LICENSE
}
```
but with a tab before vlicense, not spaces.

Re: [PR REVIEW] New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#discussion_r558836157

Comment:
You hardcoded `2.9.2` in one spot in the URL yet expanded `${version}` in another? It's recommended to expand `${version}` when possible to make maintaining easier. Try switching `distfiles` to `distfiles="https://github.com/sourceryinstitute/OpenCoarrays/archive/${version}.tar.gz"` and match the checksum.

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761539910

Comment:
There are three commits, there should only be one. Try squashing your commits with rebase: `git rebase -i HEAD~3` and squash the last two, having the commit message just be "New package: OpenCoarrays-2.9.2", just use `amend` to commit future changes.
```
git commit --amend
git push origin master -f
```
One thing I might recommend while I'm on git things, I would recommend making a specific branch on your fork, e.g.
```
git checkout -b opencoarrays
<add your template>
git add -A
git commit -m "New package: OpenCoarrays-2.9.2"
git push origin opencoarrays
```
then, on this PR, switch to request merging that branch from your fork to the upstream master branch.

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761542134

Comment:
Haven't tested, but, from what I've read on upstream's documentation, [this](https://pastebin.com/z4ea1hEu) template might be helpful as a start point.

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761542134

Comment:
Haven't tested, but, from what I've read on upstream's documentation, [this](https://pastebin.com/ZcSugsGe) template might be helpful as a start point.

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761544111

Comment:
I tried testing on aarch64-musl, and found that:
```
=> OpenCoarrays-2.9.2_1: building [cmake] for aarch64-musl...
   [host] gcc-fortran-9.3.0_9: found (https://alpha.de.repo.voidlinux.org/current/musl)
   [host] openmpi-4.1.0_1: found (https://alpha.de.repo.voidlinux.org/current/musl)
   [host] cmake-3.19.3_1: found (https://alpha.de.repo.voidlinux.org/current/musl)
   [target] libgfortran-devel-9.3.0_9: found (https://alpha.de.repo.voidlinux.org/current/aarch64)
   [target] openmpi-devel-4.1.0_1: not found
```
`openmpi` isn't on cross platform. I have an updated template [here](https://pastebin.com/pZQzpSQB). I don't know much about fortran, though.

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761544111

Comment:
I tried testing on aarch64-musl, and found that:
```
=> OpenCoarrays-2.9.2_1: building [cmake] for aarch64-musl...
   [host] gcc-fortran-9.3.0_9: found (https://alpha.de.repo.voidlinux.org/current/musl)
   [host] openmpi-4.1.0_1: found (https://alpha.de.repo.voidlinux.org/current/musl)
   [host] cmake-3.19.3_1: found (https://alpha.de.repo.voidlinux.org/current/musl)
   [target] libgfortran-devel-9.3.0_9: found (https://alpha.de.repo.voidlinux.org/current/aarch64)
   [target] openmpi-devel-4.1.0_1: not found
```
`openmpi` isn't on cross platform. I have an updated template here:
```
# Template file for 'OpenCoarrays'
pkgname=OpenCoarrays
version=2.9.2
revision=1
build_style=cmake
hostmakedepends="gcc-fortran openmpi"
makedepends="libgfortran-devel openmpi-devel"
short_desc="Parallel application binary interface for Fortran 2018 compilers"
maintainer="Alberto Ramos <alberto.ramos@ific.uv.es>"
license="BSD-3-Clause"
homepage="https://opencoarrays.org"
distfiles="https://github.com/sourceryinstitute/OpenCoarrays/archive/${version}.tar.gz"
checksum=a11639034ecc2445b6e5efa187ab4fac2b0b384ddae5872d62f717b40922d259
nocross="openmpi not available on cross build"
 
post_install() {
	vlicense LICENSE
}
```
This passes `xbps-src` locally on my x86_64-musl machine. The `hostmakedepends` and `makedepends` of the template I made could probably be cleaned up a bit, I don't know much about fortran, though.

Re: [PR PATCH] [Updated] New package: Opencoarrays-2.9.2

[ramos]

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

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

https://github.com/ramos/void-packages master
https://github.com/void-linux/void-packages/pull/27618

New package: Opencoarrays-2.9.2


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

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

From 304b7768c2029afd455182cca9e9cb45e7523693 Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sat, 2 Jan 2021 11:09:03 +0100
Subject: [PATCH 001/752] New package: Opencoarrays-2.9.2

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
new file mode 100644
index 00000000000..1dd0b170662
--- /dev/null
+++ b/srcpkgs/OpenCoarrays/template
@@ -0,0 +1,15 @@
+# Template file for 'OpenCoarrays'
+pkgname=OpenCoarrays
+version=2.9.2
+revision=1
+build_style=cmake
+short_desc="OpenCoarray fortran PAGS paralellization library"
+maintainer="Alberto Ramos <alberto.ramos@ific.uv.es>"
+hostdepends="gcc gcc-fortran openmpi openmpi-devel cmake"
+makedepends="gcc gcc-fortran openmpi openmpi-devel cmake"
+depends="gcc gcc-fortran openmpi openmpi-devel cmake"
+license="GPL-3.0-or-later"
+homepage="http://www.opencoarrays.org/"
+distfiles="https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.9.2/OpenCoarrays-${version}.tar.gz"
+checksum=6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7
+

From 0d286721f0ebe228fcaf41f0705776b97b317b5f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 2 Jan 2021 11:54:12 -0600
Subject: [PATCH 002/752] stellarium: update to 0.20.4.

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

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index 075aa0a8332..8b7efd36a10 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.20.3
+version=0.20.4
 revision=1
 build_style=cmake
 hostmakedepends="perl qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ 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=2781a364d14c203c21a11ef528d541559ed749e1b6c3dbc1187410a6c23ab97c
+checksum=63033bb6ad01b5f021689766b2a09a99bcabcfec57a710e46a93c40a32fda388
 
 stellarium-data_package() {
 	short_desc+=" - data files"

From 33393ba2d1d0fd0cca03c2af6481bdecbdb8230d Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Fri, 1 Jan 2021 11:24:42 +1100
Subject: [PATCH 003/752] New package: evtest-qt

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

diff --git a/srcpkgs/evtest-qt/template b/srcpkgs/evtest-qt/template
new file mode 100644
index 00000000000..24674e1151e
--- /dev/null
+++ b/srcpkgs/evtest-qt/template
@@ -0,0 +1,13 @@
+# Template file for 'evtest-qt'
+pkgname=evtest-qt
+version=0.2.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-devel"
+short_desc="Linux Joystick Tester for Qt"
+maintainer="a dinosaur <nick@a-dinosaur.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Grumbel/evtest-qt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d07df91840fc2dde0f69c1e4be503df1d92bbad6c1e936532d6579dc5d1c1baa

From 64cf49deab3dd293d6a61bfc1350ac163eb8bdf2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jan 2021 21:12:53 +0100
Subject: [PATCH 004/752] linux-tools: add bpftool

Glibc only. :(

Also make sure bash completions end up in the right packages.
---
 srcpkgs/bpftool              |  1 +
 srcpkgs/linux-tools/template | 47 ++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/bpftool

diff --git a/srcpkgs/bpftool b/srcpkgs/bpftool
new file mode 120000
index 00000000000..6594bfcc259
--- /dev/null
+++ b/srcpkgs/bpftool
@@ -0,0 +1 @@
+linux-tools
\ No newline at end of file
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index e23f9da7ed3..6ff237d5dd8 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,14 +1,15 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=5.10.4
-revision=1
+revision=2
 wrksrc="linux-${version}"
 build_style=meta
-hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto"
-makedepends="babeltrace-devel binutils-devel eudev-libudev-devel
+hostmakedepends="asciidoc automake flex gettext libtool perl python3
+ python3-docutils xmlto"
+makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
  libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
- libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel
- elfutils-devel"
+ libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
+ slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
 short_desc="Linux kernel tools meta-pkg"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,7 +19,7 @@ distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
 checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
 python_version=3
 
-subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
+subpackages="cpupower freefall libcpupower libcpupower-devel libusbip libusbip-devel perf tmon usbip"
 
 CFLAGS="-Wno-error -fcommon"
 case "$XBPS_TARGET_MACHINE" in
@@ -32,6 +33,10 @@ ppc64*)
 	;;
 esac
 case "$XBPS_TARGET_MACHINE" in
+*-musl) ;;
+*)	subpackages+=" bpftool";;  # needs FTW_ACTIONRETVAL
+esac
+case "$XBPS_TARGET_MACHINE" in
 i686-musl) makedepends+=" libucontext-devel libunwind-devel" ;;
 esac
 
@@ -75,6 +80,14 @@ do_build() {
 
 	cd ${wrksrc}/tools/thermal/tmon
 	make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+
+	case "$XBPS_TARGET_MACHINE" in
+	*-musl) ;;
+	*)
+		cd ${wrksrc}/tools/bpf
+		make -C bpftool all doc
+		make -W runqslower
+	esac
 }
 
 do_install() {
@@ -108,15 +121,35 @@ do_install() {
 	printf 'usbip-core\nusbip-host\n' > \
 		${DESTDIR}/usr/lib/modules-load.d/usbip.conf
 
+	# bpf
+	case "$XBPS_TARGET_MACHINE" in
+	*-musl) ;;
+	*)
+		cd ${wrksrc}/tools/bpf
+		make -W runqslower_install install DESTDIR=${DESTDIR} prefix=/usr
+		make -C bpftool doc-install DESTDIR=${DESTDIR} prefix=/usr/share
+		mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
+	esac
+
 	rm ${DESTDIR}/usr/include/cpuidle.h
 }
 
+bpftool_package() {
+	short_desc="Linux kernel tools for BPF"
+	pkg_install() {
+		vmove "usr/bin/bpf*"
+		vmove usr/share/bash-completion/completions/bpftool
+		vmove "usr/share/man/man7/bpf*"
+		vmove "usr/share/man/man8/bpf*"
+	}
+}
 cpupower_package() {
 	short_desc="Linux kernel tool to set CPU power features"
 	conf_files="/etc/cpufreq-bench.conf"
 	pkg_install() {
 		vmove "usr/bin/cpu*"
 		vmove "usr/share/man/man1/cpu*"
+		vmove usr/share/bash-completion/completions/cpupower
 		vmove usr/share/doc/cpupower
 		vmove usr/share/locale
 		vmove etc/cpufreq-bench.conf
@@ -158,7 +191,7 @@ perf_package() {
 		vmove usr/bin/trace
 		vmove usr/lib/perf
 		vmove usr/libexec/perf-core
-		vmove usr/share/bash-completion
+		vmove usr/share/bash-completion/completions/perf
 		if ! [ "$XBPS_TARGET_MACHINE" = i686 ]; then
 			vmove usr/share/perf-core
 		fi

From 7d4d7d039347bf5e122110d176034c3aff8dd19b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 2 Jan 2021 12:17:50 -0600
Subject: [PATCH 005/752] minitube: update to 3.7.

---
 srcpkgs/minitube/template | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 8f4ebaa1f5a..23ef018ad9f 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -1,10 +1,7 @@
 # Template file for 'minitube'
 pkgname=minitube
-version=3.4.2
+version=3.7
 revision=1
-_commit_hash_http=9f6c1ebafc5877936f845723ffd72a475073f237
-_commit_hash_media=02ec169a6ba406ced208c52f9ee7fdb85276d484
-_commit_hash_idle=6aa092da64a011e445bf31cf31c0cd8dda4c64ff
 build_style=qmake
 hostmakedepends="qt5-tools qt5-qmake git"
 makedepends="qt5-devel phonon-qt5-devel qt5-script-devel qt5-declarative-devel
@@ -14,25 +11,13 @@ short_desc="Qt5-based YouTube client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://flavio.tordini.org/minitube"
-distfiles="https://github.com/flaviotordini/minitube/archive/${version}.tar.gz
- https://github.com/flaviotordini/http/archive/${_commit_hash_http}.tar.gz
- https://github.com/flaviotordini/media/archive/${_commit_hash_media}.tar.gz
- https://github.com/flaviotordini/idle/archive/${_commit_hash_idle}.tar.gz"
-checksum="d3c18c99fd73c6f66c3def9ae18d2545776a8718367dbd4f9c0a9e0cef38bd8b
- 51229ea2e9ccaa7bb2784c135ef6547a36a95e1c256de850d72edf64d6a64642
- 8091b035c839d6e1b50edf0c56b77bc1ecfba81771725435d4ab15101e7c3205
- 597156e1f7ac3b8d8bdd251008cc0d10487c120462576088eed69425048d4bde"
+distfiles="https://github.com/flaviotordini/minitube/releases/download/${version}/minitube-${version}.tar.bz2"
+checksum=a8dd0db3f3f8172abc1ea940d3bf533e87c9a4f8a1df2ce38ff2e0cda728107e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-declarative-devel"
 fi
 
-post_extract() {
-	mv -T "../http-${_commit_hash_http}" lib/http
-	mv -T "../media-${_commit_hash_media}" lib/media
-	mv -T "../idle-${_commit_hash_idle}" lib/idle
-}
-
 pre_configure() {
 	# Provided by Gottox
 	local _api_key=AIzaSyBzMj41taMuHLAF95-y9cTXL4JpPGqMORk

From dd64f0b5850d90377df71e4766b7e54fce30cbe6 Mon Sep 17 00:00:00 2001
From: Laura Liberda <laura@selfisekai.rocks>
Date: Sat, 2 Jan 2021 21:50:55 +0100
Subject: [PATCH 006/752] onedrive: update to 2.4.9

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

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 006c64c6ba4..80b8edc4e96 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,6 +1,6 @@
 # Template file for 'onedrive'
 pkgname=onedrive
-version=2.4.8
+version=2.4.9
 revision=3
 build_style=gnu-configure
 configure_args="DC=ldc2"
@@ -10,9 +10,9 @@ short_desc="OneDrive Client for Linux"
 maintainer="selfisekai <laura@selfisekai.rocks>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/abraunegg/onedrive"
-changelog="https://raw.githubusercontent.com/abraunegg/onedrive/v${version}/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/abraunegg/onedrive/master/CHANGELOG.md"
 distfiles="https://github.com/abraunegg/onedrive/archive/v${version}.tar.gz"
-checksum=0d67fb19a301720a8961d8bbe4d5c69b7f2833af81ee1818dd6fa6aab8361b99
+checksum=27be7a0e898a6e2aa425eaecb983def4e81147e2e453c36c63f584e8c999966a
 nocross="uses host flags for cross compilations"
 
 post_install() {

From cc4f63574155d81acc37dd37121ba271e1cd2227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 2 Jan 2021 23:53:57 +0100
Subject: [PATCH 007/752] libucontext: proper patch for x86

Make renaming of local __i868.get_pc_thunk.bx to i686_get_pc_thunk_bx a proper patch.
---
 .../patches/arch-x86-i668_get_thunk_bx.patch  | 20 +++++++++++++++++++
 srcpkgs/libucontext/template                  |  3 ---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch

diff --git a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
new file mode 100644
index 00000000000..702f06f5b28
--- /dev/null
+++ b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
@@ -0,0 +1,20 @@
+--- arch/x86/startcontext.S	2020-05-18 05:28:21.000000000 +0200
++++ arch/x86/startcontext.S	2021-01-02 23:52:32.728187160 +0100
+@@ -18,7 +18,7 @@
+ 	cmpl	$0, (%esp)
+ 
+ 	/* restore global offset table, exit@plt and __setcontext@plt need this */
+-	call	__i686.get_pc_thunk.bx
++	call	i686_get_pc_thunk_bx
+ 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
+ 
+ 	/* if we have no linked context, lets get out of here */
+@@ -35,7 +35,7 @@
+ 	/* something is really hosed, call hlt to force termination */
+ 	hlt
+ 
+-__i686.get_pc_thunk.bx:
++i686_get_pc_thunk_bx:
+ 	mov	(%esp), %ebx
+ 	ret
+ END(__start_context)
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index be891eb6f42..738b1e317d0 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -22,9 +22,6 @@ mips*)  export LIBUCONTEXT_ARCH="mips";;
 esac
 
 do_build() {
-	case "${XBPS_TARGET_MACHINE}" in
-	i686*) vsed -i arch/x86/startcontext.S -e "s;__i686.get_pc_thunk.bx;i686_get_pc_thunk_bx;g" ;;
-	esac
 	make ARCH="${LIBUCONTEXT_ARCH}"
 }
 

From 11e4fa1620976379830d134043783cdbbf0e73e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 3 Jan 2021 02:57:15 +0100
Subject: [PATCH 008/752] ion: update to latest git revision

No release tag since 2017-07-15 and the alpha release 1.0.5 fails to build.
---
 srcpkgs/ion/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/ion/template b/srcpkgs/ion/template
index 3bb3aeb6653..254fdcb1f42 100644
--- a/srcpkgs/ion/template
+++ b/srcpkgs/ion/template
@@ -1,20 +1,21 @@
 # Template file for 'ion'
 pkgname=ion
-version=1.0.5
-revision=2
+version=1.0.5.20201230
+revision=1
+_githash=2bc8826a97929b1878375a5c747e5c4cfed2b10b
+wrksrc="${pkgname}-${_githash}"
 build_style=cargo
-register_shell="/bin/ion"
-short_desc="The Ion Shell, written in Rust"
+short_desc="Ion shell, written in Rust"
 maintainer="Muhammad Herdiansyah <herdiansyah@opmbx.org>"
 license="MIT"
-nostrip="yes" # Stripping binaries doesn't work in ARM, Remove once fixed.
 homepage="https://github.com/redox-os/ion"
-distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=7c7f696060a82669cb9c73cf0ec1d07d4ffefbfd54fc60acad0179ca3f46716d
+distfiles="${homepage}/archive/${_githash}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=8ab295c5ff40de6b7a8dd93ee8d417b6e884f2b66b628409e4cd9345d70e9c00
+register_shell="/bin/ion"
 
-case "$XBPS_TARGET_MACHINE" in
-	aarch64-musl|ppc*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/14113/steps/shell_3/logs/stdio"
-esac
+pre_build() {
+	echo ${_githash} > git_revision.txt
+}
 
 post_install() {
 	vlicense LICENSE

From 926522637ac82162546b8500105d8d26b4c408d3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Jan 2021 03:31:44 +0100
Subject: [PATCH 009/752] linux-tools: a hack to fix build of bpftool on ppc*

---
 srcpkgs/linux-tools/patches/ppc-bpf.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/linux-tools/patches/ppc-bpf.patch

diff --git a/srcpkgs/linux-tools/patches/ppc-bpf.patch b/srcpkgs/linux-tools/patches/ppc-bpf.patch
new file mode 100644
index 00000000000..251047b6c2c
--- /dev/null
+++ b/srcpkgs/linux-tools/patches/ppc-bpf.patch
@@ -0,0 +1,15 @@
+https://www.mail-archive.com/netdev@vger.kernel.org/msg364272.html
+
+--- tools/include/uapi/linux/types.h
++++ tools/include/uapi/linux/types.h
+@@ -20,4 +20,10 @@ typedef __u32 __bitwise __wsum;
+ #define __aligned_be64 __be64 __attribute__((aligned(8)))
+ #define __aligned_le64 __le64 __attribute__((aligned(8)))
+ 
++#ifdef __powerpc__
++typedef struct {
++	__u32 u[4];
++} __attribute__((aligned(16))) __vector128;
++#endif
++
+ #endif /* _UAPI_LINUX_TYPES_H */

From 1d2e6bbfab2d88f9d353a34a2b3a9904aa94467e Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 2 Jan 2021 19:29:10 -0700
Subject: [PATCH 010/752] youtube-dl: update to 2021.01.03

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

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 3ccd20b9c4a..6b8b800f1ec 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2020.12.31
+version=2021.01.03
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://yt-dl.org"
 changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=094ef8b000a9e9fcaf624eb316ac8d52643224604fdf841a14aa69a5fe9f9859
+checksum=91de98ce1ad5d53c912eb810dd747ed30825dbf7eacb09a385ce227232eb1163
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 775f7754c690a5061bddd140fa1a72a26cca6f7b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Jan 2021 10:23:39 +0100
Subject: [PATCH 011/752] wine: update to 6.0rc5.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index dcc5a7cd043..0e6629f4c3e 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.0rc4
+version=6.0rc5
 revision=1
 wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
-checksum=9dd7813918277d89ad3dbbd911eb1a7ada1c92778f17c727ca3a9fba591c7ec5
+checksum=f1f10a0aef4dcc9cf4ec67f0828fc1f7f364e2e8e7c2f027c253c8e2004bf451
 
 lib32mode=full
 archs="i686* x86_64*"

From 113c9e2abab887983f474e7f04865530c68ee9b4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Jan 2021 13:19:30 +0100
Subject: [PATCH 012/752] openblas: fix build on ppc64le/ppc64 glibc

on musl, __builtin_cpu_is will always return 0 because it relies
on glibc funcitonality, on glibc it will fail to compile because
power10 is only an allowed argument from gcc10
---
 .../openblas/patches/ppc-dynamic-gcc9.patch   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch

diff --git a/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch b/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch
new file mode 100644
index 00000000000..2be46aec36b
--- /dev/null
+++ b/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch
@@ -0,0 +1,25 @@
+From 7a3c188fb1bf669aa4cf571e1e6fbcd1692f4f7a Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 3 Jan 2021 13:16:16 +0100
+Subject: [PATCH] fix build on gcc9
+
+---
+ driver/others/dynamic_power.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git driver/others/dynamic_power.c driver/others/dynamic_power.c
+index a2f56d8..e79e7e9 100644
+--- driver/others/dynamic_power.c
++++ driver/others/dynamic_power.c
+@@ -53,7 +53,7 @@ static gotoblas_t *get_coretype(void) {
+ 		return &gotoblas_POWER10;
+ #endif
+ 	/* Fall back to the POWER9 implementation if the toolchain is too old or the MMA feature is not set */
+-#if (!defined __GNUC__) || ( __GNUC__ >= 6)
++#if (!defined __GNUC__) || ( __GNUC__ >= 10)
+ 	if (__builtin_cpu_is("power10"))
+ 		return &gotoblas_POWER9;
+ #endif	
+-- 
+2.30.0
+

From 62dfad4b0413f300308eff12b228ea17941bad6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 3 Jan 2021 13:34:26 +0100
Subject: [PATCH 013/752] disorderfs: update to 0.5.10

Adding to CXXFLAGS in the Makefile does not work with build style gnu-makefile
thus define the fuse CFLAGS etc. in the CXXFLAGS of the template.
---
 srcpkgs/disorderfs/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/disorderfs/template b/srcpkgs/disorderfs/template
index 21aebc583e2..479514b962c 100644
--- a/srcpkgs/disorderfs/template
+++ b/srcpkgs/disorderfs/template
@@ -1,6 +1,6 @@
 # Template file for 'disorderfs'
 pkgname=disorderfs
-version=0.5.8
+version=0.5.10
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -13,7 +13,9 @@ license="GPL-3.0-or-later"
 homepage="https://reproducible-builds.org/tools/"
 #changelog="https://salsa.debian.org/reproducible-builds/disorderfs/raw/master/NEWS"
 distfiles="https://salsa.debian.org/reproducible-builds/disorderfs/-/archive/${version}/disorderfs-${version}.tar.bz2"
-checksum=52820890a62ae4088c4c7252975e21af7051302a5635ee33bdc2906aa9b4e1e7
+checksum=f268a9c743a7b7f7b9d3e506d0454230a4fccce2e35850f772cae98eade07df6
+
+CXXFLAGS="-std=c++11 -Wno-unused-parameter -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse -DFUSE_USE_VERSION=26"
 
 do_check() {
 	# Requires permission to perform fuse mounts

From e6efca436f8b882358c5df7e2a3d4b1fba44ed45 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Jan 2021 13:59:48 +0100
Subject: [PATCH 014/752] xbps-src: make sure to apply FFLAGS properly like
 CFLAGS

---
 common/build-profiles/aarch64-musl.sh     |  2 +-
 common/build-profiles/aarch64.sh          |  2 +-
 common/build-profiles/armv6l-musl.sh      |  2 +-
 common/build-profiles/armv6l.sh           |  2 +-
 common/build-profiles/armv7l-musl.sh      |  2 +-
 common/build-profiles/armv7l.sh           |  2 +-
 common/build-profiles/i686-musl.sh        |  2 +-
 common/build-profiles/i686.sh             |  2 +-
 common/build-profiles/ppc-musl.sh         |  2 +-
 common/build-profiles/ppc.sh              |  2 +-
 common/build-profiles/ppc64-musl.sh       |  2 +-
 common/build-profiles/ppc64.sh            |  2 +-
 common/build-profiles/ppc64le-musl.sh     |  2 +-
 common/build-profiles/ppc64le.sh          |  2 +-
 common/build-profiles/ppcle-musl.sh       |  2 +-
 common/build-profiles/ppcle.sh            |  2 +-
 common/build-profiles/x86_64-musl.sh      |  2 +-
 common/build-profiles/x86_64.sh           |  2 +-
 common/cross-profiles/aarch64-musl.sh     |  2 +-
 common/cross-profiles/aarch64.sh          |  2 +-
 common/cross-profiles/armv5tel-musl.sh    |  2 +-
 common/cross-profiles/armv5tel.sh         |  2 +-
 common/cross-profiles/armv6l-musl.sh      |  2 +-
 common/cross-profiles/armv6l.sh           |  2 +-
 common/cross-profiles/armv7l-musl.sh      |  2 +-
 common/cross-profiles/armv7l.sh           |  2 +-
 common/cross-profiles/i686-musl.sh        |  2 +-
 common/cross-profiles/i686.sh             |  2 +-
 common/cross-profiles/mips-musl.sh        |  2 +-
 common/cross-profiles/mipsel-musl.sh      |  2 +-
 common/cross-profiles/mipselhf-musl.sh    |  2 +-
 common/cross-profiles/mipshf-musl.sh      |  2 +-
 common/cross-profiles/ppc-musl.sh         |  2 +-
 common/cross-profiles/ppc.sh              |  2 +-
 common/cross-profiles/ppc64-musl.sh       |  2 +-
 common/cross-profiles/ppc64.sh            |  2 +-
 common/cross-profiles/ppc64le-musl.sh     |  2 +-
 common/cross-profiles/ppc64le.sh          |  2 +-
 common/cross-profiles/ppcle-musl.sh       |  2 +-
 common/cross-profiles/ppcle.sh            |  2 +-
 common/cross-profiles/x86_64-musl.sh      |  2 +-
 common/cross-profiles/x86_64.sh           |  2 +-
 common/environment/configure/hardening.sh |  2 ++
 common/xbps-src/shutils/chroot.sh         |  2 +-
 common/xbps-src/shutils/common.sh         | 10 ++++++----
 etc/defaults.conf                         |  3 ++-
 46 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/common/build-profiles/aarch64-musl.sh b/common/build-profiles/aarch64-musl.sh
index 8e52f1eaee0..76249d0b75c 100644
--- a/common/build-profiles/aarch64-musl.sh
+++ b/common/build-profiles/aarch64-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-march=armv8-a"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="aarch64-unknown-linux-musl"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
diff --git a/common/build-profiles/aarch64.sh b/common/build-profiles/aarch64.sh
index 233445d8f2c..ccf7d5af3d5 100644
--- a/common/build-profiles/aarch64.sh
+++ b/common/build-profiles/aarch64.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-march=armv8-a"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="aarch64-unknown-linux-gnu"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
diff --git a/common/build-profiles/armv6l-musl.sh b/common/build-profiles/armv6l-musl.sh
index 1c94bf70d13..172e56e81a8 100644
--- a/common/build-profiles/armv6l-musl.sh
+++ b/common/build-profiles/armv6l-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv6l-linux-musleabihf"
 XBPS_RUST_TARGET="arm-unknown-linux-musleabihf"
diff --git a/common/build-profiles/armv6l.sh b/common/build-profiles/armv6l.sh
index 384e328a6e6..d84b6bdb2cc 100644
--- a/common/build-profiles/armv6l.sh
+++ b/common/build-profiles/armv6l.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv6l-unknown-linux-gnueabihf"
 XBPS_RUST_TARGET="arm-unknown-linux-gnueabihf"
diff --git a/common/build-profiles/armv7l-musl.sh b/common/build-profiles/armv7l-musl.sh
index caadaee541a..f81ad699e07 100644
--- a/common/build-profiles/armv7l-musl.sh
+++ b/common/build-profiles/armv7l-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_CXXFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv7l-linux-musleabihf"
 XBPS_RUST_TARGET="armv7-unknown-linux-musleabihf"
diff --git a/common/build-profiles/armv7l.sh b/common/build-profiles/armv7l.sh
index 89c8badd2af..a100e410f9a 100644
--- a/common/build-profiles/armv7l.sh
+++ b/common/build-profiles/armv7l.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="armv7l-unknown-linux-gnueabihf"
 XBPS_RUST_TARGET="armv7-unknown-linux-gnueabihf"
diff --git a/common/build-profiles/i686-musl.sh b/common/build-profiles/i686-musl.sh
index c690a2e211b..7b9e232723c 100644
--- a/common/build-profiles/i686-musl.sh
+++ b/common/build-profiles/i686-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="i686-pc-linux-musl"
 XBPS_RUST_TARGET="i686-unknown-linux-musl"
diff --git a/common/build-profiles/i686.sh b/common/build-profiles/i686.sh
index 550bbf5b9f6..036a91b2b92 100644
--- a/common/build-profiles/i686.sh
+++ b/common/build-profiles/i686.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="i686-pc-linux-gnu"
 XBPS_RUST_TARGET="i686-unknown-linux-gnu"
diff --git a/common/build-profiles/ppc-musl.sh b/common/build-profiles/ppc-musl.sh
index dd3255a4ced..17296432e97 100644
--- a/common/build-profiles/ppc-musl.sh
+++ b/common/build-profiles/ppc-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=G4"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc-linux-musl"
 XBPS_RUST_TARGET="powerpc-unknown-linux-musl"
diff --git a/common/build-profiles/ppc.sh b/common/build-profiles/ppc.sh
index b5a0a703267..f7ec35b69a6 100644
--- a/common/build-profiles/ppc.sh
+++ b/common/build-profiles/ppc.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=G4"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc-linux-gnu"
 XBPS_RUST_TARGET="powerpc-unknown-linux-gnu"
diff --git a/common/build-profiles/ppc64-musl.sh b/common/build-profiles/ppc64-musl.sh
index d28f9ed303d..53c5ea6fb3f 100644
--- a/common/build-profiles/ppc64-musl.sh
+++ b/common/build-profiles/ppc64-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mcpu=970 -mtune=power9"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64-unknown-linux-musl"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
diff --git a/common/build-profiles/ppc64.sh b/common/build-profiles/ppc64.sh
index 3e44e8f5fa6..aa9af966ea7 100644
--- a/common/build-profiles/ppc64.sh
+++ b/common/build-profiles/ppc64.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mcpu=970 -mtune=power9"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64-unknown-linux-gnu"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
diff --git a/common/build-profiles/ppc64le-musl.sh b/common/build-profiles/ppc64le-musl.sh
index e78e3f7bd05..cb9423f9974 100644
--- a/common/build-profiles/ppc64le-musl.sh
+++ b/common/build-profiles/ppc64le-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=power9"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64le-unknown-linux-musl"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
diff --git a/common/build-profiles/ppc64le.sh b/common/build-profiles/ppc64le.sh
index bdace1eaaf5..c91ea054789 100644
--- a/common/build-profiles/ppc64le.sh
+++ b/common/build-profiles/ppc64le.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=power9"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpc64le-unknown-linux-gnu"
 XBPS_RUST_TARGET="$XBPS_TRIPLET"
diff --git a/common/build-profiles/ppcle-musl.sh b/common/build-profiles/ppcle-musl.sh
index 6d6efc65b86..7585c4f6919 100644
--- a/common/build-profiles/ppcle-musl.sh
+++ b/common/build-profiles/ppcle-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mcpu=power8 -mtune=power9"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpcle-linux-musl"
 XBPS_RUST_TARGET="powerpcle-unknown-linux-musl"
diff --git a/common/build-profiles/ppcle.sh b/common/build-profiles/ppcle.sh
index eb256542a45..0cdc6cc853c 100644
--- a/common/build-profiles/ppcle.sh
+++ b/common/build-profiles/ppcle.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mcpu=power8 -mtune=power9"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="powerpcle-linux-gnu"
 XBPS_RUST_TARGET="powerpcle-unknown-linux-gnu"
diff --git a/common/build-profiles/x86_64-musl.sh b/common/build-profiles/x86_64-musl.sh
index 303f747bd3e..b0bbb30bd16 100644
--- a/common/build-profiles/x86_64-musl.sh
+++ b/common/build-profiles/x86_64-musl.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=generic"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="x86_64-unknown-linux-musl"
 XBPS_RUST_TARGET="${XBPS_TRIPLET}"
diff --git a/common/build-profiles/x86_64.sh b/common/build-profiles/x86_64.sh
index 4f0647f1976..a53f4aafdac 100644
--- a/common/build-profiles/x86_64.sh
+++ b/common/build-profiles/x86_64.sh
@@ -1,5 +1,5 @@
 XBPS_TARGET_CFLAGS="-mtune=generic"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TARGET_FFLAGS=""
+XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
 XBPS_TRIPLET="x86_64-unknown-linux-gnu"
 XBPS_RUST_TARGET="${XBPS_TRIPLET}"
diff --git a/common/cross-profiles/aarch64-musl.sh b/common/cross-profiles/aarch64-musl.sh
index 143cfa5262b..56ce2d32964 100644
--- a/common/cross-profiles/aarch64-musl.sh
+++ b/common/cross-profiles/aarch64-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="aarch64"
 XBPS_CROSS_TRIPLET="aarch64-linux-musl"
 XBPS_CROSS_CFLAGS="-march=armv8-a"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="aarch64-unknown-linux-musl"
diff --git a/common/cross-profiles/aarch64.sh b/common/cross-profiles/aarch64.sh
index 2b549a4e99c..068870a3158 100644
--- a/common/cross-profiles/aarch64.sh
+++ b/common/cross-profiles/aarch64.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="aarch64"
 XBPS_CROSS_TRIPLET="aarch64-linux-gnu"
 XBPS_CROSS_CFLAGS="-march=armv8-a"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="aarch64-unknown-linux-gnu"
diff --git a/common/cross-profiles/armv5tel-musl.sh b/common/cross-profiles/armv5tel-musl.sh
index 15ed04e93a8..3894f0c8731 100644
--- a/common/cross-profiles/armv5tel-musl.sh
+++ b/common/cross-profiles/armv5tel-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-musleabi"
 XBPS_CROSS_CFLAGS="-march=armv5te -msoft-float -mfloat-abi=soft"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-musleabi"
diff --git a/common/cross-profiles/armv5tel.sh b/common/cross-profiles/armv5tel.sh
index 9b083866d33..d56c50a8006 100644
--- a/common/cross-profiles/armv5tel.sh
+++ b/common/cross-profiles/armv5tel.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-gnueabi"
 XBPS_CROSS_CFLAGS="-march=armv5te -msoft-float -mfloat-abi=soft"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-gnueabi"
diff --git a/common/cross-profiles/armv6l-musl.sh b/common/cross-profiles/armv6l-musl.sh
index 7d1e6df477f..58b67f85a97 100644
--- a/common/cross-profiles/armv6l-musl.sh
+++ b/common/cross-profiles/armv6l-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-musleabihf"
 XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-musleabihf"
diff --git a/common/cross-profiles/armv6l.sh b/common/cross-profiles/armv6l.sh
index dcac7da43b9..b146eb87219 100644
--- a/common/cross-profiles/armv6l.sh
+++ b/common/cross-profiles/armv6l.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="arm-linux-gnueabihf"
 XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="arm-unknown-linux-gnueabihf"
diff --git a/common/cross-profiles/armv7l-musl.sh b/common/cross-profiles/armv7l-musl.sh
index b083f686971..93e3cc5b3d7 100644
--- a/common/cross-profiles/armv7l-musl.sh
+++ b/common/cross-profiles/armv7l-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="armv7l-linux-musleabihf"
 XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="armv7-unknown-linux-musleabihf"
diff --git a/common/cross-profiles/armv7l.sh b/common/cross-profiles/armv7l.sh
index e2d9d98cd56..674165e238a 100644
--- a/common/cross-profiles/armv7l.sh
+++ b/common/cross-profiles/armv7l.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="arm"
 XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf"
 XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="armv7-unknown-linux-gnueabihf"
diff --git a/common/cross-profiles/i686-musl.sh b/common/cross-profiles/i686-musl.sh
index 1dac5efd757..fcb3d8ec4b4 100644
--- a/common/cross-profiles/i686-musl.sh
+++ b/common/cross-profiles/i686-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="i386"
 XBPS_CROSS_TRIPLET="i686-linux-musl"
 XBPS_CROSS_CFLAGS="-march=i686"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="i686-unknown-linux-musl"
diff --git a/common/cross-profiles/i686.sh b/common/cross-profiles/i686.sh
index b5a55298de9..07ee8883707 100644
--- a/common/cross-profiles/i686.sh
+++ b/common/cross-profiles/i686.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="i386"
 XBPS_CROSS_TRIPLET="i686-pc-linux-gnu"
 XBPS_CROSS_CFLAGS="-march=i686"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="i686-unknown-linux-gnu"
diff --git a/common/cross-profiles/mips-musl.sh b/common/cross-profiles/mips-musl.sh
index 94feb50673e..f1d9fe2fd1a 100644
--- a/common/cross-profiles/mips-musl.sh
+++ b/common/cross-profiles/mips-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="mips"
 XBPS_CROSS_TRIPLET="mips-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mips-unknown-linux-musl"
diff --git a/common/cross-profiles/mipsel-musl.sh b/common/cross-profiles/mipsel-musl.sh
index d0e736262bd..0d1117deb06 100644
--- a/common/cross-profiles/mipsel-musl.sh
+++ b/common/cross-profiles/mipsel-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="mipsel"
 XBPS_CROSS_TRIPLET="mipsel-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mipsel-unknown-linux-musl"
diff --git a/common/cross-profiles/mipselhf-musl.sh b/common/cross-profiles/mipselhf-musl.sh
index f0012ee8b12..8587a88e6ca 100644
--- a/common/cross-profiles/mipselhf-musl.sh
+++ b/common/cross-profiles/mipselhf-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="mipsel"
 XBPS_CROSS_TRIPLET="mipsel-linux-muslhf"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -mhard-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mipsel-unknown-linux-musl"
diff --git a/common/cross-profiles/mipshf-musl.sh b/common/cross-profiles/mipshf-musl.sh
index 57bfeea9db4..2914eaf19f8 100644
--- a/common/cross-profiles/mipshf-musl.sh
+++ b/common/cross-profiles/mipshf-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="mips"
 XBPS_CROSS_TRIPLET="mips-linux-muslhf"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -mhard-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="mips-unknown-linux-musl"
diff --git a/common/cross-profiles/ppc-musl.sh b/common/cross-profiles/ppc-musl.sh
index 97e068c7a12..631b1fb427e 100644
--- a/common/cross-profiles/ppc-musl.sh
+++ b/common/cross-profiles/ppc-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc"
 XBPS_CROSS_TRIPLET="powerpc-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=G4"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc-unknown-linux-musl"
diff --git a/common/cross-profiles/ppc.sh b/common/cross-profiles/ppc.sh
index d5298a02bfc..4647c62de2d 100644
--- a/common/cross-profiles/ppc.sh
+++ b/common/cross-profiles/ppc.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc"
 XBPS_CROSS_TRIPLET="powerpc-linux-gnu"
 XBPS_CROSS_CFLAGS="-mtune=G4"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc-unknown-linux-gnu"
diff --git a/common/cross-profiles/ppc64-musl.sh b/common/cross-profiles/ppc64-musl.sh
index 5003e2b3fec..2cc74b352a1 100644
--- a/common/cross-profiles/ppc64-musl.sh
+++ b/common/cross-profiles/ppc64-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc64"
 XBPS_CROSS_TRIPLET="powerpc64-linux-musl"
 XBPS_CROSS_CFLAGS="-mcpu=970 -mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64-unknown-linux-musl"
diff --git a/common/cross-profiles/ppc64.sh b/common/cross-profiles/ppc64.sh
index 50f77bcdd56..4fedf210000 100644
--- a/common/cross-profiles/ppc64.sh
+++ b/common/cross-profiles/ppc64.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc64"
 XBPS_CROSS_TRIPLET="powerpc64-linux-gnu"
 XBPS_CROSS_CFLAGS="-mcpu=970 -mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64-unknown-linux-gnu"
diff --git a/common/cross-profiles/ppc64le-musl.sh b/common/cross-profiles/ppc64le-musl.sh
index db300087386..b08f78c91f3 100644
--- a/common/cross-profiles/ppc64le-musl.sh
+++ b/common/cross-profiles/ppc64le-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc64le"
 XBPS_CROSS_TRIPLET="powerpc64le-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64le-unknown-linux-musl"
diff --git a/common/cross-profiles/ppc64le.sh b/common/cross-profiles/ppc64le.sh
index 7ea6342114e..88e8649a765 100644
--- a/common/cross-profiles/ppc64le.sh
+++ b/common/cross-profiles/ppc64le.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc64le"
 XBPS_CROSS_TRIPLET="powerpc64le-linux-gnu"
 XBPS_CROSS_CFLAGS="-mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpc64le-unknown-linux-gnu"
diff --git a/common/cross-profiles/ppcle-musl.sh b/common/cross-profiles/ppcle-musl.sh
index 36607ad6a74..4c69ceb140a 100644
--- a/common/cross-profiles/ppcle-musl.sh
+++ b/common/cross-profiles/ppcle-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc"
 XBPS_CROSS_TRIPLET="powerpcle-linux-musl"
 XBPS_CROSS_CFLAGS="-mcpu=power8 -mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpcle-unknown-linux-musl"
diff --git a/common/cross-profiles/ppcle.sh b/common/cross-profiles/ppcle.sh
index d35857acbb7..c4ece96b7bf 100644
--- a/common/cross-profiles/ppcle.sh
+++ b/common/cross-profiles/ppcle.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="ppc"
 XBPS_CROSS_TRIPLET="powerpcle-linux-gnu"
 XBPS_CROSS_CFLAGS="-mcpu=power8 -mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="powerpcle-unknown-linux-gnu"
diff --git a/common/cross-profiles/x86_64-musl.sh b/common/cross-profiles/x86_64-musl.sh
index 83834b82746..a1c27c6f793 100644
--- a/common/cross-profiles/x86_64-musl.sh
+++ b/common/cross-profiles/x86_64-musl.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="x86_64"
 XBPS_CROSS_TRIPLET="x86_64-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=generic"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="x86_64-unknown-linux-musl"
diff --git a/common/cross-profiles/x86_64.sh b/common/cross-profiles/x86_64.sh
index f389cd6207c..360dd2068fc 100644
--- a/common/cross-profiles/x86_64.sh
+++ b/common/cross-profiles/x86_64.sh
@@ -5,6 +5,6 @@ XBPS_TARGET_QEMU_MACHINE="x86_64"
 XBPS_CROSS_TRIPLET="x86_64-linux-gnu"
 XBPS_CROSS_CFLAGS="-mtune=generic"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
-XBPS_CROSS_FFLAGS=""
+XBPS_CROSS_FFLAGS="$XBPS_CROSS_CFLAGS"
 XBPS_CROSS_RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 XBPS_CROSS_RUST_TARGET="x86_64-unknown-linux-gnu"
diff --git a/common/environment/configure/hardening.sh b/common/environment/configure/hardening.sh
index 10b67c75fd8..9e02364f2a1 100644
--- a/common/environment/configure/hardening.sh
+++ b/common/environment/configure/hardening.sh
@@ -19,10 +19,12 @@ if [ -z "$nopie" ]; then
 		# Enable FORITFY_SOURCE=2
 		CFLAGS="-fstack-clash-protection -D_FORTIFY_SOURCE=2 ${CFLAGS}"
 		CXXFLAGS="-fstack-clash-protection -D_FORTIFY_SOURCE=2 ${CXXFLAGS}"
+		FFLAGS="-fstack-clash-protection ${FFLAGS}"
 		LDFLAGS="-Wl,-z,relro -Wl,-z,now ${LDFLAGS}"
 	fi
 else
 	CFLAGS="-fno-PIE ${CFLAGS}"
 	CXXFLAGS="-fno-PIE ${CFLAGS}"
+	FFLAGS="-fno-PIE ${FFLAGS}"
 	LDFLAGS="-no-pie ${LDFLAGS}"
 fi
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a03d5866bcf..8646d758549 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -69,7 +69,7 @@ $(grep -E '^XBPS_.*' "$XBPS_CONFIG_FILE")
 XBPS_MASTERDIR=/
 XBPS_CFLAGS="$XBPS_CFLAGS"
 XBPS_CXXFLAGS="$XBPS_CXXFLAGS"
-XBPS_FFLAGS="-fPIC -pipe"
+XBPS_FFLAGS="$XBPS_FFLAGS"
 XBPS_CPPFLAGS="$XBPS_CPPFLAGS"
 XBPS_LDFLAGS="$XBPS_LDFLAGS"
 XBPS_HOSTDIR=/host
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 4e5e83f416a..be75d31e622 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -342,7 +342,7 @@ setup_pkg() {
     if [ -n "$cross" ]; then
         source_file $XBPS_CROSSPFDIR/${cross}.sh
 
-        _vars="TARGET_MACHINE CROSS_TRIPLET CROSS_CFLAGS CROSS_CXXFLAGS TARGET_QEMU_MACHINE"
+        _vars="TARGET_MACHINE CROSS_TRIPLET CROSS_CFLAGS CROSS_CXXFLAGS CROSS_FFLAGS TARGET_QEMU_MACHINE"
         for f in ${_vars}; do
             eval val="\$XBPS_$f"
             if [ -z "$val" ]; then
@@ -507,7 +507,7 @@ setup_pkg() {
 
     export CFLAGS="$XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
     export CXXFLAGS="$XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
-    export FFLAGS="$XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS"
+    export FFLAGS="$XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS $dbgflags"
     export CPPFLAGS="$XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"
     export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
 
@@ -571,6 +571,7 @@ setup_pkg() {
         export CXXFLAGS_target="$CXXFLAGS"
         export CPPFLAGS_target="$CPPFLAGS"
         export LDFLAGS_target="$LDFLAGS"
+	export FFLAGS_target="$FFLAGS"
         # Host tools
         export CC_host="cc"
         export CXX_host="g++"
@@ -591,6 +592,7 @@ setup_pkg() {
         export CXXFLAGS_host="$XBPS_CXXFLAGS"
         export CPPFLAGS_host="$XBPS_CPPFLAGS"
         export LDFLAGS_host="$XBPS_LDFLAGS"
+	export FFLAGS_host="$XBPS_FFLAGS"
         # Rust flags which are passed to rustc
         export RUSTFLAGS="$XBPS_CROSS_RUSTFLAGS"
         # Rust target, which differs from our triplets
@@ -625,10 +627,10 @@ setup_pkg() {
         # Unset cross evironment variables
         unset CC_target CXX_target CPP_target GCC_target FC_target LD_target AR_target AS_target
         unset RANLIB_target STRIP_target OBJDUMP_target OBJCOPY_target NM_target READELF_target
-        unset CFLAGS_target CXXFLAGS_target CPPFLAGS_target LDFLAGS_target
+        unset CFLAGS_target CXXFLAGS_target CPPFLAGS_target LDFLAGS_target FFLAGS_target
         unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host
         unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host
-        unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
+        unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host FFLAGS_host
         unset RUSTFLAGS
     fi
 
diff --git a/etc/defaults.conf b/etc/defaults.conf
index 60980ee3f69..bc93457747f 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -25,11 +25,12 @@
 #XBPS_INSTALL_ARGS=""
 
 # [OPTIONAL]
-# Native Compilation/Preprocessor flags for C and C++. Additional settings
+# Native Compilation/Preprocessor flags for C/C++/Fortran. Additional settings
 # for the target architecture are also declared in common/build-profiles/<arch>.sh.
 #
 XBPS_CFLAGS="-O2 -pipe"
 XBPS_CXXFLAGS="${XBPS_CFLAGS}"
+XBPS_FFLAGS="${XBPS_CFLAGS}"
 
 # [OPTIONAL]
 # Linker flags passed to the compiler.

From f912b01cf102250fbcdc27b7fb2218f54e8c4481 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Jan 2021 14:03:27 +0100
Subject: [PATCH 015/752] R: remove FFLAGS=CFLAGS hack

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

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 1a272c93bc6..def4ddaa50e 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -26,7 +26,6 @@ shlib_provides="libR.so"
 pre_configure() {
 	export R_BROWSER=/usr/bin/xdg-open
 	export R_PDFVIEWER=/usr/bin/xdg-open
-	export FFLAGS="$CFLAGS"
 }
 
 post_install() {

From efe330fbf688cb2c46194b460fbe86d4b43f2b2a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Jan 2021 18:39:39 +0100
Subject: [PATCH 016/752] fzf: update to 0.25.0.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index dbc43ef9871..6c43ea9a0be 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.24.4
+version=0.25.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=0d9d3ed3cefee86accc2634fc98211af1d571845d912256c33ca0c8b2963d8bd
+checksum=ccbe13733d692dbc4f0e4c0d40c053cba8d22f309955803692569fb129e42eb0
 
 post_install() {
 	cd ${wrksrc}

From 44933b927be207cde2b3d41cb1ed0b041bcdf947 Mon Sep 17 00:00:00 2001
From: Ulf <github@uw.anonaddy.com>
Date: Sat, 2 Jan 2021 09:47:08 +0000
Subject: [PATCH 017/752] python3-chromecast: update to 7.7.1.

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

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index e07078d8051..97a9cd9c99d 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,18 +1,17 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=4.1.0
-revision=3
+version=7.7.1
+revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
-pycompile_module="pychromecast"
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-protobuf python3-zeroconf python3-casttube"
 short_desc="Python3 library to communicate with Google Chromecast"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
-homepage="https://github.com/balloob/pychromecast"
-distfiles="https://github.com/balloob/pychromecast/archive/${version}.tar.gz"
-checksum=648921783ee29ae50719aac83a6cbb7f6c6651c6d4ef2b32554575ee08d87c62
+homepage="https://github.com/home-assistant-libs/pychromecast"
+distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
+checksum=933aa7e334c931739a92ae9869cc0f42752177b7abf0e01460a34e611ad8c0ee
 
 post_install() {
 	vlicense LICENSE

From 45acaf523d0c643d8143de4bcb22c3d7495768b1 Mon Sep 17 00:00:00 2001
From: Ulf <github@uw.anonaddy.com>
Date: Sat, 2 Jan 2021 10:38:41 +0000
Subject: [PATCH 018/752] qsynth: update to 0.9.0.

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

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 20993ac25c4..058743f761f 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'qsynth'
 pkgname=qsynth
-version=0.6.3
+version=0.9.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"
 depends="fluidsynth jack desktop-file-utils hicolor-icon-theme"
 short_desc="Qt GUI Interface for FluidSynth"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="http://qsynth.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1b5733d35b4b24679d59812cf9a5f3152ac0c78046ba1db71870cb7effad3876
+checksum=72ab545c39b7ca518be3dfaaee61c8ce88b20d4c34dff946898a8ca7d8e85ae4
 
 if [ "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-x11extras-devel"

From faba26914f7501d551c729305505429ae73d2ee6 Mon Sep 17 00:00:00 2001
From: Ulf <github@uw.anonaddy.com>
Date: Sat, 2 Jan 2021 09:22:03 +0000
Subject: [PATCH 019/752] lxtask: update to 0.1.10.

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

diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template
index 28e5458db4a..f35f9e772f4 100644
--- a/srcpkgs/lxtask/template
+++ b/srcpkgs/lxtask/template
@@ -1,17 +1,17 @@
 # Template file for 'lxtask'
 pkgname=lxtask
-version=0.1.9
-revision=2
+version=0.1.10
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
 short_desc="LXDE Task Manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
-checksum=41ea88f0adf31a840e4b9d137ca5ea802860d1a117845ba25f3080d74a876433
+checksum=2216df9bc4bb2d80733e788966512ac58c421e0a0a1ff85210f34a29d1eb4e2c
 
 CFLAGS="-fcommon"

From 6941cf52f96b591a7b3727c9e91af682f61bc4f2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 3 Jan 2021 17:49:41 +0100
Subject: [PATCH 020/752] nano: update to 5.4.

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

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index ffa3fd3bf61..ddd121dbf8f 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=5.3
+version=5.4
 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=c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352
+checksum=fe993408b22286355809ce48ebecc4444d19af8203ed4959d269969112ed86e9
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From 690de45a4cc7e6fecb7b5bd213f6a8d457334276 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Sun, 3 Jan 2021 02:38:43 +0800
Subject: [PATCH 021/752] uni: update to 2.0.0

Build should also be fixed on ppc64/ppc64le now.

Closes: #27625 [via git-merge-pr]
---
 srcpkgs/uni/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index c44233ac9dc..1d7bd119b5f 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,6 +1,6 @@
 # Template file for 'uni'
 pkgname=uni
-version=1.1.0
+version=2.0.0
 revision=1
 build_style=go
 go_import_path=arp242.net/uni
@@ -9,11 +9,7 @@ maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/arp242/uni"
 distfiles="https://github.com/arp242/uni/archive/v${version}.tar.gz"
-checksum=938712d1e750b8dcea9f42d4691b66e15dbc7c7ce0200400f20f79702dc97bac
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="./print.go:18:14: undefined: isatty.IsTerminal"
-esac
+checksum=744e1d49b9cc8e336e260e0e922b28bb60f8fdaf347e656e964b5f4353c5162a
 
 post_install() {
 	vlicense LICENSE

From 19ed6767c85ef46b7ee1476b21018dfe0ccad64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 3 Jan 2021 17:24:44 -0300
Subject: [PATCH 022/752] .github/workflows: shorten step list.

This makes CI results more concise.
---
 .github/workflows/build.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..d8328911eec 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -62,13 +62,14 @@ jobs:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 200
-      - name: Create hostrepo
-        run: ln -s "$(pwd)" /hostrepo
-      - run: common/travis/set_mirror.sh
-      - run: common/travis/prepare.sh
-      - run: common/travis/fetch_upstream.sh
+      - name: Create hostrepo and prepare masterdir
+        run: |
+         ln -s "$(pwd)" /hostrepo &&
+         common/travis/set_mirror.sh &&
+         common/travis/prepare.sh &&
+         common/travis/fetch_upstream.sh &&
+         common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
-      - run: common/travis/fetch-xtools.sh
       - name: Remove git after checkout to not interfere with build
         run: xbps-remove -yR git
 

From 38cdf645b454c2dcd44e4431d76f2df7d657b5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 4 Jan 2021 01:03:27 +0100
Subject: [PATCH 023/752] Carls: fix build

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

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 8ea0fb0ab7b..2a13d9d5e8e 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -5,7 +5,7 @@ revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+hostmakedepends="pkg-config python3 python3-PyQt5-devel-tools which"
 makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
  liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
  gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel

From e330da98f5002bef4a13834a82889c5403104d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 4 Jan 2021 01:17:02 +0100
Subject: [PATCH 024/752] DarkRadiant: fix build

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

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 8dfc5477b80..feb3e095a03 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -15,6 +15,8 @@ homepage="https://github.com/codereader/DarkRadiant/"
 distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz"
 checksum=b0a15d24a1f574616a1631dca64ee69545cd21ebecdc6bf8c8afd1b69ec53f5b
 
+CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0"
+
 do_check() {
 	:
 }

From 61d7551091a792e91470491310788a1ec69bbce2 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 31 Dec 2020 08:28:01 -0700
Subject: [PATCH 025/752] mesa: update to 20.3.2.

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

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index d6797b170dc..97c294cfb9b 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.3.1
+version=20.3.2
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f
+checksum=cce001b685d23afb976b04138714906abcf7e7f996da6355e6a43e5ca486533d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From be151038c15b1ab874a53979d88c256b0bdeb771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 11 Oct 2020 00:43:04 -0300
Subject: [PATCH 026/752] pam: update to 1.5.1, update homepage, adopt.

Also:

- Cracklib is deprecated and disabled by default.
- pam_tally and pam_tally2 have been removed.
- Add checkdepends.
- Add changelog.

Due to the pam_tally removal, this package has to depend on the newest
version of pam-base.
---
 srcpkgs/pam/INSTALL.msg                       |  7 +++
 srcpkgs/pam/patches/musl-fix-pam_exec.patch   | 31 -------------
 .../pam/patches/pam_unix_sys_resource.patch   | 10 -----
 srcpkgs/pam/patches/portability-fixes.patch   | 44 -------------------
 srcpkgs/pam/template                          | 41 ++++++++---------
 5 files changed, 25 insertions(+), 108 deletions(-)
 create mode 100644 srcpkgs/pam/INSTALL.msg
 delete mode 100644 srcpkgs/pam/patches/musl-fix-pam_exec.patch
 delete mode 100644 srcpkgs/pam/patches/pam_unix_sys_resource.patch
 delete mode 100644 srcpkgs/pam/patches/portability-fixes.patch

diff --git a/srcpkgs/pam/INSTALL.msg b/srcpkgs/pam/INSTALL.msg
new file mode 100644
index 00000000000..e5767f32ca2
--- /dev/null
+++ b/srcpkgs/pam/INSTALL.msg
@@ -0,0 +1,7 @@
+WARNING: PAM>=1.5.0 has removed the pam_tally and pam_tally2 modules,
+as well as the pam_lastlog module on musl. If you have a custom PAM
+config, you will need to fix it immediately for these changes.
+
+Otherwise, the pam-base-0.4 update will have handled these changes for
+you, unless your XBPS config uses "keepconf=true",
+"preserve=/etc/pam.d/system-login" or "preserve=/etc/pam.d/*".
diff --git a/srcpkgs/pam/patches/musl-fix-pam_exec.patch b/srcpkgs/pam/patches/musl-fix-pam_exec.patch
deleted file mode 100644
index b6b999faed7..00000000000
--- a/srcpkgs/pam/patches/musl-fix-pam_exec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./modules/pam_exec/pam_exec.c.orig
-+++ ./modules/pam_exec/pam_exec.c
-@@ -103,11 +103,14 @@
-   int optargc;
-   const char *logfile = NULL;
-   const char *authtok = NULL;
-+  char authtok_buf[PAM_MAX_RESP_SIZE+1];
-+
-   pid_t pid;
-   int fds[2];
-   int stdout_fds[2];
-   FILE *stdout_file = NULL;
- 
-+  memset(authtok_buf, 0, sizeof(authtok_buf));
-   if (argc < 1) {
-     pam_syslog (pamh, LOG_ERR,
- 		"This module needs at least one argument");
-@@ -178,11 +181,11 @@
- 		}
- 
- 	      pam_set_item (pamh, PAM_AUTHTOK, resp);
--	      authtok = strndupa (resp, PAM_MAX_RESP_SIZE);
-+	      authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf));
- 	      _pam_drop (resp);
- 	    }
- 	  else
--	    authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE);
-+	    authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf));
- 
- 	  if (pipe(fds) != 0)
- 	    {
diff --git a/srcpkgs/pam/patches/pam_unix_sys_resource.patch b/srcpkgs/pam/patches/pam_unix_sys_resource.patch
deleted file mode 100644
index 21f313b3584..00000000000
--- a/srcpkgs/pam/patches/pam_unix_sys_resource.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/pam_unix/pam_unix_acct.c.orig	2012-07-09 15:01:11.592269364 +0200
-+++ modules/pam_unix/pam_unix_acct.c	2012-07-09 15:01:54.615228076 +0200
-@@ -47,6 +47,7 @@
- #include <time.h>		/* for time() */
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>	/* for RLIMIT_NOFILE */
- 
- #include <security/_pam_macros.h>
- 
diff --git a/srcpkgs/pam/patches/portability-fixes.patch b/srcpkgs/pam/patches/portability-fixes.patch
deleted file mode 100644
index 6f395008208..00000000000
--- a/srcpkgs/pam/patches/portability-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- modules/pam_lastlog/pam_lastlog.c.orig     2014-01-11 12:56:15.735248391 +0100
-+++ modules/pam_lastlog/pam_lastlog.c  2014-01-11 12:57:33.142756424 +0100
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <syslog.h>
- #include <unistd.h>
-+#include <paths.h>
- 
- #if defined(hpux) || defined(sunos) || defined(solaris)
- # ifndef _PATH_LASTLOG
-@@ -403,7 +404,9 @@ last_login_write(pam_handle_t *pamh, int
- 
-     if (announce & LASTLOG_WTMP) {
-       /* write wtmp entry for user */
-+#ifdef HAVE_LOGWTMP
-       logwtmp(last_login.ll_line, user, remote_host);
-+#endif
-     }
- 
-     /* cleanup */
-@@ -713,7 +716,9 @@ pam_sm_close_session (pam_handle_t *pamh
-     terminal_line = get_tty(pamh);
- 
-     /* Wipe out utmp logout entry */
-+#ifdef HAVE_LOGWTMP
-     logwtmp(terminal_line, "", "");
-+#endif
- 
-     return PAM_SUCCESS;
- }
---- modules/pam_rhosts/pam_rhosts.c.orig       2014-01-11 12:58:40.263196779 +0100
-+++ modules/pam_rhosts/pam_rhosts.c    2014-01-11 12:59:25.182491398 +0100
-@@ -113,8 +113,10 @@ int pam_sm_authenticate (pam_handle_t *p
- 
- #ifdef HAVE_RUSEROK_AF
-     retval = ruserok_af (rhost, as_root, ruser, luser, PF_UNSPEC);
--#else
-+#elif HAVE_RUSEROK
-     retval = ruserok (rhost, as_root, ruser, luser);
-+#else
-+    retval = 1;
- #endif
-     if (retval != 0) {
-       if (!opt_silent || opt_debug)
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 161f96ad51f..6168a318429 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,16 +1,18 @@
 # Template file for 'pam'
 pkgname=pam
-version=1.3.0
-revision=2
+version=1.5.1
+revision=1
 wrksrc="Linux-PAM-$version"
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib --sbindir=/usr/bin --docdir=/usr/share/doc/pam
- --disable-nis --disable-cracklib --disable-audit --disable-selinux
+ --disable-nis --disable-audit --disable-selinux
  --disable-regenerate-docu BUILD_CFLAGS=-Os BUILD_LDFLAGS="
-hostmakedepends="automake gettext-devel flex libtool pkg-config"
+hostmakedepends="gettext-devel pkg-config"
 makedepends="libfl-devel db-devel"
-depends="pam-base"
+# version of pam-base that doesn't include removed modules
+depends="pam-base>=0.4_1"
+checkdepends="${depends}"
 conf_files="
 	/etc/environment
 	/etc/security/access.conf
@@ -22,31 +24,24 @@ conf_files="
 make_dirs="
 	/etc/security/limits.d 0755 root root
 	/etc/security/namespace.d 0755 root root"
-lib32disabled=yes
 short_desc="Flexible mechanism for authenticating users"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="BSD-3-Clause"
-homepage="http://www.kernel.org/pub/linux/libs/pam/"
-distfiles="http://linux-pam.org/library/Linux-PAM-${version}.tar.bz2"
-checksum=241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb
+homepage="https://github.com/linux-pam/linux-pam"
+changelog="https://raw.githubusercontent.com/linux-pam/linux-pam/master/NEWS"
+distfiles="${homepage}/releases/download/v${version}/Linux-PAM-${version}.tar.xz"
+checksum=201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc
+lib32disabled=yes
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) configure_args+=" ac_cv_search_crypt=no";;
-	esac
-	autoreconf -fi
-}
+if [ "$XBPS_CHECK_PKGS" = musl ]; then
+	configure_args+=" ac_cv_search_crypt=no"
+fi
 
 post_install() {
 	# Fix unix_chkpwd perms.
 	chmod 4755 ${DESTDIR}/usr/bin/unix_chkpwd
-	#
-	# Fix a syntax error in namespace.init, -p flag is unknown
-	# at least to dash and bash.
-	#
-	sed -i -e "s|^#!/bin/sh -p$|#!/bin/sh|" \
-		${DESTDIR}/etc/security/namespace.init
-	chmod 755 ${DESTDIR}/etc/security/namespace.init
+	rm -r ${DESTDIR}/usr/lib/systemd
+	vlicense COPYING LICENSE
 }
 
 pam-devel_package() {

From 4339423d8d89f29cb67796b310da739a3725aaa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 3 Jan 2021 23:20:48 -0300
Subject: [PATCH 027/752] playerctl: update to 2.3.1.

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

diff --git a/srcpkgs/playerctl/template b/srcpkgs/playerctl/template
index da6f9b55de4..ff82ddacf87 100644
--- a/srcpkgs/playerctl/template
+++ b/srcpkgs/playerctl/template
@@ -1,6 +1,6 @@
 # Template file for 'playerctl'
 pkgname=playerctl
-version=2.2.1
+version=2.3.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/acrisci/playerctl"
 changelog="https://github.com/altdesktop/playerctl/raw/master/CHANGELOG.md"
 distfiles="https://github.com/acrisci/playerctl/archive/v${version}.tar.gz"
-checksum=b431a693e815056964d084bcbf3813aee1cc9f92a4a3c1a7df9ae98d663efd03
+checksum=62b55123fe0fcbb5add8b7abdf7b039d2d74662f851def77b482bd1ca0440608
 
 build_options="doc gir"
 desc_option_doc="Build documentation"  # fails :(

From b1bde6bbf8a735532316bae7ffd7b24c37aff647 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sun, 3 Jan 2021 12:40:03 -0700
Subject: [PATCH 028/752] mu: update to 1.4.14

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

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 3bea57d7c89..30b8b446ae2 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,7 +1,7 @@
 # Template file for 'mu'
 pkgname=mu
-version=1.4.13
-revision=2
+version=1.4.14
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=b26a504f8660b6374e0285daf7e26e6eb4ec0668bf2c8b4b1cd7667c4ebe6e8e
+checksum=df6410dbe4cbe74f1495a996a558e1429f83f1aaf1588f5cb8df73a9baff60ba
 
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" emacs"

From 6a86b275646d3054800261c24c06d41366c30e71 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 3 Jan 2021 19:29:01 +0100
Subject: [PATCH 029/752] moreutils: update to 0.65.

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

diff --git a/srcpkgs/moreutils/template b/srcpkgs/moreutils/template
index 60ff492c4e3..909d90dd1ea 100644
--- a/srcpkgs/moreutils/template
+++ b/srcpkgs/moreutils/template
@@ -1,6 +1,6 @@
 # Template file for 'moreutils'
 pkgname=moreutils
-version=0.64
+version=0.65
 revision=1
 build_style=gnu-makefile
 make_build_args="DOCBOOK2XMAN=docbook2man"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-only, BSD-2-Clause"
 homepage="https://joeyh.name/code/moreutils/"
 distfiles="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/moreutils-${version}.tar.gz"
-checksum=fed203542c5c2b55c3a41d21bca5bc627ec1f6d7313ed2f758c69798d65770ec
+checksum=60c9f6b55204e64cfcd12fd66e75cf7a061b6761f3d5b7797f2452cb17598881
 
 post_install() {
 	# rename parallel to not conflict with gnu-parllel

From 2533fecbff3c220e8551efaeb24b0843df105ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 3 Jan 2021 23:32:00 -0300
Subject: [PATCH 030/752] waypipe: update to 0.7.2.

Also remove INSTALL.msg, since it's no longer relevant.
---
 srcpkgs/waypipe/INSTALL.msg | 2 --
 srcpkgs/waypipe/template    | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/waypipe/INSTALL.msg

diff --git a/srcpkgs/waypipe/INSTALL.msg b/srcpkgs/waypipe/INSTALL.msg
deleted file mode 100644
index 13af63bc124..00000000000
--- a/srcpkgs/waypipe/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-CAUTION: Waypipe>=0.7.0 uses a new wire protocol, and won't work with
-previous versions.
diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index 229137b8e36..eb8a103ea51 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,6 +1,6 @@
 # Template file for 'waypipe'
 pkgname=waypipe
-version=0.7.0
+version=0.7.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_style=meson
 configure_args="-Dwerror=false -Dwith_dmabuf=enabled -Dwith_lz4=enabled
  -Dwith_zstd=enabled -Dwith_video=enabled -Dwith_vaapi=enabled -Db_lto=false"
 hostmakedepends="wayland-devel scdoc pkg-config"
-makedepends="wayland-protocols liblz4-devel libzstd-devel libva-devel
+makedepends="liblz4-devel libzstd-devel libva-devel
  MesaLib-devel libdrm-devel ffmpeg-devel"
 depends="openssh"
 short_desc="Proxy for Wayland clients"
@@ -16,7 +16,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 distfiles="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=ce14508af422acc212b4eee6faae4c84e082abd8b3b85655bec36e942200b9fa
+checksum=b280079b05aef9b243be3644fc803e3feaa2fc2952d11a6c02ab33257fb52479
 
 post_install() {
 	vlicense COPYING LICENSE

From 5385a20e70a742d5235cfd7d985dafd0453cf751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Sep 2020 16:06:20 -0300
Subject: [PATCH 031/752] Waybar: update to 0.9.5.

Enable new sndio module.
---
 srcpkgs/Waybar/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index ecdc581c4b1..16588a75f87 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.4
+version=0.9.5
 revision=1
 _date_version=3.0.0
 create_wrksrc=yes
@@ -11,7 +11,8 @@ configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
  -Dlibnl=$(vopt_if libnl enabled disabled)
  -Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
  -Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)
- -Dmpd=$(vopt_if mpd enabled disabled)"
+ -Dmpd=$(vopt_if mpd enabled disabled)
+ -Dsndio=$(vopt_if sndio enabled disabled)"
 hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
  $(vopt_if dbusmenugtk gobject-introspection)"
 makedepends="libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
@@ -19,7 +20,8 @@ makedepends="libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
  $(vopt_if libnl libnl3-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
- $(vopt_if mpd libmpdclient-devel)"
+ $(vopt_if mpd libmpdclient-devel)
+ $(vopt_if sndio sndio-devel)"
 short_desc="Polybar-like Wayland Bar for Sway and Wlroots based compositors"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
@@ -29,12 +31,12 @@ 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="d49c09ee253ca9cc9688d1b4d8602adc9bdae613b02e2fa1a2e7277ddc9e82e8
+checksum="74d783d4da01c1c3a90a00968d74f47c2193a6952c3b2e0584cf3ddfa1ae4254
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 
-build_options="libnl pulseaudio dbusmenugtk mpd"
-build_options_default="libnl pulseaudio dbusmenugtk mpd"
+build_options="libnl pulseaudio dbusmenugtk mpd sndio"
+build_options_default="libnl pulseaudio dbusmenugtk mpd sndio"
 
 desc_option_libnl="Enable libnl support for network related features"
 desc_option_dbusmenugtk="Enable support for tray"

From 8cdaaa078b9fe803b4438d7f03e3882ee8619cbc Mon Sep 17 00:00:00 2001
From: Dominic Monroe <iam@dominic.io>
Date: Fri, 13 Mar 2020 08:49:47 +0000
Subject: [PATCH 032/752] New package: linux-vt-setcolors-1.0.0

---
 srcpkgs/linux-vt-setcolors/patches/8.diff | 14 ++++++++++++++
 srcpkgs/linux-vt-setcolors/template       | 15 +++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 srcpkgs/linux-vt-setcolors/patches/8.diff
 create mode 100644 srcpkgs/linux-vt-setcolors/template

diff --git a/srcpkgs/linux-vt-setcolors/patches/8.diff b/srcpkgs/linux-vt-setcolors/patches/8.diff
new file mode 100644
index 00000000000..dcbda45499a
--- /dev/null
+++ b/srcpkgs/linux-vt-setcolors/patches/8.diff
@@ -0,0 +1,14 @@
+diff --git Makefile Makefile
+index 7a9cc3e..ad5ad1d 100644
+--- Makefile
++++ Makefile
+@@ -1,7 +1,8 @@
+ PREFIX=/usr/local
++CFLAGS=-Wall
+ 
+ setcolors: setcolors.c
+-	gcc -Wall setcolors.c -o setcolors
++	$(CC) $(CFLAGS) setcolors.c -o setcolors
+ 
+ install: setcolors setcolors.1
+ 	install -Dm 755 setcolors "${DESTDIR}${PREFIX}/bin/setcolors"
diff --git a/srcpkgs/linux-vt-setcolors/template b/srcpkgs/linux-vt-setcolors/template
new file mode 100644
index 00000000000..fa3f7681b75
--- /dev/null
+++ b/srcpkgs/linux-vt-setcolors/template
@@ -0,0 +1,15 @@
+# Template file for 'linux-vt-setcolors'
+pkgname=linux-vt-setcolors
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+short_desc="Utility tool to set the linux VT default color palette"
+maintainer="Dominic Monroe <monroef4@googlemail.com>"
+license="MIT"
+homepage="https://github.com/EvanPurkhiser/linux-vt-setcolors"
+distfiles="https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v${version}.tar.gz"
+checksum=ccad9aac5732faab749e8f6f6b40746ce44afec5633374aa77c8e3ac2a8eef42
+
+post_install() {
+	vlicense LICENSE
+}

From 8a850c23387b3bc75c7b3887e7ec6d539363bfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 4 Jan 2021 13:51:42 +0100
Subject: [PATCH 033/752] clxclient: fix build

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

diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 060af359900..6391174621a 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -14,6 +14,8 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
 
+CXXFLAGS="-fPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 	# fix wrong header import

From 8ea0259e21bf8cce8cabbac9b2b8c2e54e424f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 4 Jan 2021 14:15:49 +0100
Subject: [PATCH 034/752] freeplane: update to 1.8.11

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

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 41106081afd..52a4365845f 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.8
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=e305910769f64c76ef5079714983f3161753f3b8801b1bd11df7e5fbb0c9ea6d
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From 43ef6d94e5c010f9c978978c4105d20e4f7721e1 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Mon, 4 Jan 2021 00:26:17 +0000
Subject: [PATCH 035/752] hstr: update to 2.3

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

diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index ee1bc8b0ce9..ee259a9eac0 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,20 +1,21 @@
 # Template file for 'hstr'
 pkgname=hstr
-version=2.2
+version=2.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="readline-devel"
 short_desc="Easily view, navigate, search and manage your command history"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Neel Chotai <neel@chot.ai>"
 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=886531ca9d8d1a5a93a3db96e9fc64154a03f6de428c74c722b41057bceca266
+checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b
 
 pre_configure() {
-	grep -rli '#include <ncursesw/curses.h>' src | xargs -i@ sed -i 's|ncursesw/curses.h|curses.h|g' @
+	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

From 7306756b42415bd2593cdfecb47e1dfdfd863c73 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 4 Jan 2021 09:06:23 -0600
Subject: [PATCH 036/752] termshark: update to 2.2.0.

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

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 8a9cb5362d9..941c36f66d5 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,6 +1,6 @@
 # Template file for 'termshark'
 pkgname=termshark
-version=2.1.1
+version=2.2.0
 revision=1
 build_style=go
 go_import_path="github.com/gcla/termshark"
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="MIT"
 homepage="https://github.com/gcla/termshark"
 distfiles="https://github.com/gcla/termshark/archive/v${version}.tar.gz"
-checksum=c02a21e0a61b791b1287b85acc33834ccd3bb4efb40be52e5a74d2b989d51416
+checksum=deefdb0b65e5d5b97c305cf280770724542f8dd122502f616e394c62c91db0c4
 
 post_install() {
 	vlicense LICENSE

From 2cc8d76d99f231e5ab03277a46081e76f8a25e6b Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:49:17 +0100
Subject: [PATCH 037/752] intellij-idea-community-edition: update to 2020.3.1.

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

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

From 35cf29a81c850cd62fec0aaf851965cef043220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 13:38:39 -0300
Subject: [PATCH 038/752] mdBook: update to 0.4.5.

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

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 27605d21024..6ebb2c6526d 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.4
+version=0.4.5
 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=eaf01085bd25e2efa07b561148afa5e3da3386e5f2c35b245961dc485562c154
+checksum=79fd98bddab8611cae9071aeb327edfcc67b4e449d5653d41d2ee5b04bee3afc
 
 post_install() {
 	vlicense LICENSE

From ccbf2c697961d1232d2d7811dc818a658c494428 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 4 Jan 2021 17:24:45 +0100
Subject: [PATCH 039/752] webkit2gtk: fix bubblewrap launcher on 32-bit systems

since glibc's ld cache now points to lib32 rather than lib, and
the launcher was bind-mounting just lib+lib64, the web process was
failing to find the webkit libs; so patch the lib64 export to deal
with lib32/lib64 properly

just a rebuild would've fixed this too, since they also export
LIBDIR and LIBDIR would be lib32 after rebuild (since the cmake
build-style was changed), but since we need a rebuild anyway,
might as well fix it right
---
 .../webkit2gtk/patches/bwrap-libdir32.patch   | 45 +++++++++++++++++++
 srcpkgs/webkit2gtk/template                   |  6 ++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch

diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
new file mode 100644
index 00000000000..1c83d3f4eb3
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -0,0 +1,45 @@
+From a558bfcedf9d87d12f158a6917383d228da7ca75 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 4 Jan 2021 17:17:28 +0100
+Subject: [PATCH] fix bubblewrap libdir mounts for 32-bit systems
+
+an upstream fix should be better than this, but this is good
+enough for void, since we strictly build with gcc anyway. and
+having a small patch is more important than portable patch
+---
+ .../UIProcess/Launcher/glib/BubblewrapLauncher.cpp   | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
+index 889388a..a7a75a8 100644
+--- Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
++++ Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
+@@ -733,6 +733,12 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
+     if (launchOptions.processType == ProcessLauncher::ProcessType::Network)
+         return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
+ 
++#if __UINTPTR_MAX__ > 0xFFFFFFFF
++#  define LIB_DIR_WS "lib64"
++#else
++#  define LIB_DIR_WS "lib32"
++#endif
++
+     Vector<CString> sandboxArgs = {
+         "--die-with-parent",
+         "--unshare-pid",
+@@ -765,9 +771,9 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
+         "--ro-bind-try", "/usr/lib", "/usr/lib",
+         "--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
+         "--ro-bind-try", LIBDIR, LIBDIR,
+-        "--ro-bind-try", "/lib64", "/lib64",
+-        "--ro-bind-try", "/usr/lib64", "/usr/lib64",
+-        "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
++        "--ro-bind-try", "/lib" LIB_DIR_WS, "/lib" LIB_DIR_WS,
++        "--ro-bind-try", "/usr/lib" LIB_DIR_WS, "/usr/lib" LIB_DIR_WS,
++        "--ro-bind-try", "/usr/local/lib" LIB_DIR_WS, "/usr/local/lib" LIB_DIR_WS,
+ 
+         "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
+     };
+-- 
+2.30.0
+
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 7a596a6eaa2..2259ad80b17 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
 version=2.30.4
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -49,6 +49,10 @@ desc_option_jit="JavaScript JIT (Only some architectures)"
 desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
 desc_option_minibrowser="Build the minibrowser"
 
+# on musl this is not defined and webkit uses it, so define it
+export CFLAGS="-D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
+export CXXFLAGS="$CFLAGS"
+
 do_check() {
 	:
 }

From eb576beb2ae400babe41ccdd4d7f1c37ba8bd4df Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 4 Jan 2021 18:05:41 +0100
Subject: [PATCH 040/752] xfwm4: disable compositor by default on 32-bit and BE

---
 srcpkgs/xfwm4/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 2a3352d3c64..d248ea39c22 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,7 +1,7 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -15,3 +15,10 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-${version}.tar.bz2"
 checksum=1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3
+
+post_patch() {
+	# compositor may be buggy on old and big endian hardware
+	if [ "$XBPS_TARGET_WORDSIZE" = "32" -o "$XBPS_TARGET_ENDIAN" = "be" ]; then
+		vsed -i '/use_compositing/s/true/false/' defaults/defaults
+	fi
+}

From e7887b68a20f289764d49b656ee9c103a429bc51 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Jan 2021 18:56:56 +0100
Subject: [PATCH 041/752] dovecot: update to 2.3.13.

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

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 87199e1b657..828719e5222 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.11.3
-revision=3
+version=2.3.13
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -17,9 +17,9 @@ makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
-homepage="https://dovecot.org"
+homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc
+checksum=a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 0dd0fb3b0a762076fb815ab9a27f5162b3752ad7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Jan 2021 18:57:00 +0100
Subject: [PATCH 042/752] dovecot-plugin-pigeonhole: update to 0.5.13.

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

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 93c98a48a51..778c0f16f2a 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.11
-revision=2
+version=0.5.13
+revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -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=0b972a441f680545ddfacd2f41fb2a705fb03249d46ed5ce7e01fe68b6cfb5f0
+checksum=911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 04af91023558f9c921b0987e6aa4ff74a7a0fab7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 4 Jan 2021 19:13:59 +0100
Subject: [PATCH 043/752] webkit2gtk: portable little endian check

this silences a potential problem on musl
---
 srcpkgs/webkit2gtk/patches/le-check.patch | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/webkit2gtk/patches/le-check.patch

diff --git a/srcpkgs/webkit2gtk/patches/le-check.patch b/srcpkgs/webkit2gtk/patches/le-check.patch
new file mode 100644
index 00000000000..8bd587c0a62
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/le-check.patch
@@ -0,0 +1,26 @@
+From ef8f9a0b61509401e64c717c7cc6f025f1b49300 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 4 Jan 2021 19:12:25 +0100
+Subject: [PATCH] portable little endian check
+
+---
+ Source/ThirdParty/xdgmime/src/xdgmimemagic.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git Source/ThirdParty/xdgmime/src/xdgmimemagic.c Source/ThirdParty/xdgmime/src/xdgmimemagic.c
+index 3a62b9d..9bd4e1d 100644
+--- Source/ThirdParty/xdgmime/src/xdgmimemagic.c
++++ Source/ThirdParty/xdgmime/src/xdgmimemagic.c
+@@ -485,8 +485,7 @@ _xdg_mime_magic_parse_magic_line (FILE              *magic_file,
+ 	      _xdg_mime_magic_matchlet_free (matchlet);
+ 	      return XDG_MIME_MAGIC_ERROR;
+ 	    }
+-	  /* FIXME: need to get this defined in a <config.h> style file */
+-#if LITTLE_ENDIAN
++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ 	  for (i = 0; i < matchlet->value_length; i = i + matchlet->word_size)
+ 	    {
+ 	      if (matchlet->word_size == 2)
+-- 
+2.30.0
+

From f4204f66329f58fb0a52936b7442a85902b6285f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 3 Jan 2021 18:28:29 +0100
Subject: [PATCH 044/752] ltris: update to 1.2.2.

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

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index c87106b48bd..788531a25a9 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,6 +1,6 @@
 # Template file for 'ltris'
 pkgname=ltris
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
@@ -11,5 +11,5 @@ 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=f868f79da7d4fc2029b38d16f393e9f09925daa5c7c4b3dbfdddf602fbdea924
+checksum=cf50aa5a4b7167c61fae85cdd9ea8ffbefc58b84dee756a1e279b13fb3c1b1a6
 CFLAGS+=" -fgnu89-inline"

From 0b986b78fa9136c0dbf692a4b36fe8fd95c76f09 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 3 Jan 2021 18:22:28 +0100
Subject: [PATCH 045/752] smartmontools: update to 7.2.

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

diff --git a/srcpkgs/smartmontools/template b/srcpkgs/smartmontools/template
index eb714da941e..5edc74c6017 100644
--- a/srcpkgs/smartmontools/template
+++ b/srcpkgs/smartmontools/template
@@ -1,6 +1,6 @@
 # Template file for 'smartmontools'
 pkgname=smartmontools
-version=7.1
+version=7.2
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smartd --with-libcap-ng=yes"
@@ -11,7 +11,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="http://smartmontools.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846
+checksum=5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6
 
 post_install() {
 	vsv smartd

From ad1ebdebfbaf44c5bc2b4039293e3a10de370e11 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 2 Jan 2021 23:55:59 -0800
Subject: [PATCH 046/752] CLion: update to 2020.3.1.

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

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index c1802fc5518..936a2da365a 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2020.3
+version=2020.3.1
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=ffc862511bf80debb80f9d60d2999b02e32b7c3cbb8ac25a4c0efc5b9850124f
+checksum=9a5f61360ed1fea699c3b692800e7df42e41589d6b994e2b6613e87472e4dbc9
 repository=nonfree
 restricted=yes
 nopie=yes

From 2ec37ca07270caf4f74664505a1a35333ad52753 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 30 Dec 2020 10:26:38 +1100
Subject: [PATCH 047/752] python3-PyJWT: update to 2.0.0.

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

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index 6ce0464e8cf..d8137fd5ec6 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
-version=1.7.1
-revision=3
+version=2.0.0
+revision=1
 wrksrc="PyJWT-${version}"
 build_style=python3-module
-pycompile_module="PyJWT.py"
 hostmakedepends="python3-setuptools"
+depends="python"
+checkdepends="python3-pytest"
 short_desc="Platform independent file lock"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="Unlicense"
 homepage="https://filelock.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/P/PyJWT/PyJWT-${version}.tar.gz"
-checksum=8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96
+checksum=7a2b271c6dac2fda9e0c33d176c4253faba2c6c6b3a99c7f28a32c3c97522779

From 90ab3978a5dccc0c834c7cd8beffcf638e55e7dc Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 30 Dec 2020 09:07:02 +1100
Subject: [PATCH 048/752] instaloader: update to 4.5.5.

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

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 034df7073f7..33a6f82baf7 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.5.3
+version=4.5.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,8 @@ license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/${pkgname}/${pkgname}-${version}.tar.gz
  https://raw.githubusercontent.com/${pkgname}/${pkgname}/v${version}/LICENSE"
-checksum="4cc59b68e7498c778e54599917af749aaac36a6527cbd495b80f843f7eccd8ff
- 9e721228bbfb782a6b5f3fd8494f5666f3ee8e61c592810b900955b9f1b1bae5"
+checksum="2ca70401c1a52f3955ba99cae0fb7183795260386e4ad897d6b0dec3e8a12a96
+ 5505f0eaa928f29c3ba985724688429bb275490e89e4976d2ec7da124c2fc0cc"
 skip_extraction="LICENSE"
 
 # ship your licenses, people

From 6dd44860ef2941091b19a3a875dc7a32d619ef57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Jan 2021 19:06:22 +0100
Subject: [PATCH 049/752] postgis: update to 3.1.0.

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

diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index ec5d5d23b28..28e99d427b7 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.0.3
+version=3.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=07fedbd046cbed55d24bb22474890a4651d0223b6e12d2dac1517b9a43674817
+checksum=da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {

From 61512fd4f8a3e7531483d214bf9ba9bc069f717c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Jan 2021 19:06:23 +0100
Subject: [PATCH 050/752] postgis-postgresql12: update to 3.1.0.

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

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index c692517183f..2224f943e1d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.0.3
+version=3.1.0
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=07fedbd046cbed55d24bb22474890a4651d0223b6e12d2dac1517b9a43674817
+checksum=da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {

From 75f5c91ab1aeac6d755c5c837a1588986239c549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Jan 2021 19:06:24 +0100
Subject: [PATCH 051/752] postgis-postgresql13: update to 3.1.0.

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

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 4bccc39ddd9..eaf4dac571b 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.0.3
+version=3.1.0
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=07fedbd046cbed55d24bb22474890a4651d0223b6e12d2dac1517b9a43674817
+checksum=da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {

From 851899b688f1b93e9a70438a86573e39b944a87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Jan 2021 19:06:26 +0100
Subject: [PATCH 052/752] diffoscope: update to 163.

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

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index c1626c5bbe5..037039b7443 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=161
+version=163
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,4 +15,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=9c27d60a7bf3984b53c8af3fee86eb3d3e2292c4ddb9449c38b6cba068b8e22c
+checksum=1afeea6e383bdd2626a9e9b827ff487723c0de581d9f9f4d4f5fc9b65728662a

From 350d8aac6ec5b4006e0806295350cfb305546eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Jan 2021 20:23:57 +0100
Subject: [PATCH 053/752] fetchmail: update to 6.4.15.

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

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index c00ef230326..3bf834fe8f7 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.14
+version=6.4.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -11,9 +11,9 @@ short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
-changelog="https://gitlab.com/fetchmail/fetchmail/-/blob/legacy_64/NEWS"
+changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=424707390f7cdc6d16db4887931117f2242873846b28cc1d0ae1c0ecf158bdcb
+checksum=735b217474937e13cfcdea2d42a346bf68487e0d61efebe4d0d9eddcb3a26b96
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From e46c86357f95cfe8a56d0666eb974a24d9c500a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 4 Jan 2021 13:25:22 -0500
Subject: [PATCH 054/752] xpra: update to 4.0.6.

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

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index ac7b4174345..8102e1377c6 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.0.5
+version=4.0.6
 revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-Cython"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://xpra.org/svn/Xpra/tags/v4.0.x/src/NEWS"
 distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz"
-checksum=df562b121f3c2be455f9795aea1430b45020a4b875ce638a7280ad8dbe31b486
+checksum=9c672f6d914661dda743be4b2f860dfb17166fb52c562037380aa972b4f089e8
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From d8ef46b060b21a77e94edf2a97dea4e7971a1830 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 4 Jan 2021 13:28:45 -0500
Subject: [PATCH 055/752] python3-Pillow: update to 8.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 a6f65675b37..c0e74d3f5cf 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=8.0.1
+version=8.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=11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e
+checksum=887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba
 
 do_check() {
 	PYTHONPATH=$(cd build/lib.linux-* && pwd) python3 -m pytest

From 0cc6edb1a055e893b596ed8435cb77e758216641 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 4 Jan 2021 13:36:56 -0500
Subject: [PATCH 056/752] python3-hypothesis: update to 5.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 0f11d2f13fd..13e115d96de 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=5.43.4
+version=5.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=47421b70c8c83334e754f418da39320ecb9c285a568590d83e61f45bcf52cdb4
+checksum=52581371c58321c69766cafb2ad375b3676bdf4107d02b9127a0e99d7baec94b
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From a96d5c7c6bf81031095fb114bbdac7026b48b465 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 4 Jan 2021 14:01:05 -0500
Subject: [PATCH 057/752] python3-scipy: update to 1.6.0.

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

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 13fbda59749..04b11c62dfe 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.5.4
+version=1.6.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -10,13 +10,13 @@ hostmakedepends="gcc-fortran python3-setuptools python3-Cython python3-pybind11"
 makedepends="python3-devel python3-pybind11
  $(vopt_if openblas openblas-devel lapack-devel)"
 depends="python3-numpy"
-checkdepends="python3-nose"
+checkdepends="python3-pytest"
 short_desc="Scientific library for Python3"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=5c87347bfe2db6e23d391aa226584f6b280248c0ca71e08f26f1faf9d7a76bc9
+checksum=dd06d02e8ac6e13e973cbab3da63888daf26a4fec1cd8a8d0804ec872864a7f5
 
 build_options="openblas"
 desc_option_openblas="Enable support for openblas accelerated linear algebra"
@@ -48,6 +48,10 @@ pre_build() {
 	done
 }
 
+do_check() {
+	python3 ./runtests.py --verbose
+}
+
 post_install() {
 	rm ${DESTDIR}/${py3_sitelib}/scipy/*.txt
 	vlicense LICENSE.txt

From 9ce2693c2693b73b6cf6a36dab6b5287f7ac31a5 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Mon, 4 Jan 2021 20:39:13 +0100
Subject: [PATCH 058/752] ImageMagick: update to 7.0.10.54.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 478fd68df84..92f99654290 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.10
-_patchver=51
+_patchver=54
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -21,7 +21,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=fa993169a06052267eaf81cf85bbf5a30c0bf243511017d986f47abbe65ff262
+checksum=6766bd17330b43f1c7492ac33628368a8b54dc346b9d3113267292a53964b51a
 
 subpackages="libmagick libmagick-devel"
 

From d00a4feef8ece2d1d4469ea853a14e1169f3a945 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Mon, 4 Jan 2021 20:39:15 +0100
Subject: [PATCH 059/752] ImageMagick6: update to 6.9.11.54.

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

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index cc55efa74d7..599793146d3 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.11
-_patchver=51
+_patchver=54
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=06c4363486e1053e69bb3fa211374bdaed4baa678ca8ccd1f38731f0da2d3497
+checksum=e29f89b040a8bbf679eb0a508541356d8a30c73359f469bbd19b290bf293f530
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

From db81e3c8bb026849d1269e7dbe9c13646f2c693b Mon Sep 17 00:00:00 2001
From: Andy Cobaugh <andrew.cobaugh@gmail.com>
Date: Mon, 4 Jan 2021 12:12:31 -0500
Subject: [PATCH 060/752] slack-desktop: add -p to mkdir to avoid error

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 9eda6c37e60..e64807863c1 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -24,7 +24,7 @@ do_install() {
 	vlicense usr/share/doc/slack-desktop/copyright
 	vinstall usr/share/applications/slack.desktop 644 usr/share/applications
 	vinstall usr/share/pixmaps/slack.png 644 usr/share/pixmaps
-	mkdir ${DESTDIR}/usr/{bin,lib}
+	mkdir -p ${DESTDIR}/usr/{bin,lib}
 	vcopy usr/lib/slack usr/lib
 	ln -s ../lib/slack/slack ${DESTDIR}/usr/bin/slack
 }

From 08405bfbf8fae89f2eef920c4d6892a8636c34fc Mon Sep 17 00:00:00 2001
From: Andy Cobaugh <andrew.cobaugh@gmail.com>
Date: Mon, 4 Jan 2021 15:58:56 -0500
Subject: [PATCH 061/752] textadept: remove superfluous mkdir

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

diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template
index 405af9460de..6078875b1d8 100644
--- a/srcpkgs/textadept/template
+++ b/srcpkgs/textadept/template
@@ -76,7 +76,6 @@ do_install() {
 
 	# Binaries in /usr/share/textadept are not allowed
 	# So we relocate to /usr/lib/textadept
-	mkdir -p "${DESTDIR}/usr/lib/"
 	mv "${DESTDIR}/usr/share/textadept" "${DESTDIR}/usr/lib/textadept"
 	ln -sf "/usr/lib/textadept/textadept" "${DESTDIR}/usr/bin/textadept"
 	ln -sf "/usr/lib/textadept/textadept-curses" \

From b446e08b6a123bd2054572cc1ad2f05f5381c692 Mon Sep 17 00:00:00 2001
From: Andy Cobaugh <andrew.cobaugh@gmail.com>
Date: Mon, 4 Jan 2021 16:05:11 -0500
Subject: [PATCH 062/752] slack-desktop: remove mkdir of usr/lib

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index e64807863c1..a0c55ec0c28 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -24,7 +24,7 @@ do_install() {
 	vlicense usr/share/doc/slack-desktop/copyright
 	vinstall usr/share/applications/slack.desktop 644 usr/share/applications
 	vinstall usr/share/pixmaps/slack.png 644 usr/share/pixmaps
-	mkdir -p ${DESTDIR}/usr/{bin,lib}
+	mkdir ${DESTDIR}/usr/bin
 	vcopy usr/lib/slack usr/lib
 	ln -s ../lib/slack/slack ${DESTDIR}/usr/bin/slack
 }

From 92468669232216b0c59c75238ca27362a8421a9e Mon Sep 17 00:00:00 2001
From: Ulf <github@uw.anonaddy.com>
Date: Mon, 4 Jan 2021 12:57:03 +0000
Subject: [PATCH 063/752] rooster: update to 2.8.6.

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

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index b9df272d985..76a1738601c 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,16 +1,16 @@
 # Template file for 'rooster'
 pkgname=rooster
-version=2.8.5
-revision=2
+version=2.8.6
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"
 homepage="https://github.com/conradkdotcom/rooster"
 distfiles="https://github.com/conradkdotcom/rooster/archive/v${version}.tar.gz"
-checksum=c2b83603083e30423c1637949608b957b265a0b2a93eceff4e72109a852e68c2
+checksum=b05d2c368ac26d96edd058130bfc7cc7a1960a5bfbc63b6ddfad62d27b08d62f
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.58

From cfdd85fbb559aa7a434e196f2d301cbae5fc031d Mon Sep 17 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, 31 Dec 2020 23:59:42 +0700
Subject: [PATCH 064/752] hitch: stop breaking masterdir

With grep in checkdepends, xbps-src will remove it on do_clean, which
will remove base_chroot.
---
 srcpkgs/hitch/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index b34b15e16b4..37207973dca 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
 makedepends="libev-devel libressl-devel"
-checkdepends="lsof curl grep"
+checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"
 license="BSD-2-Clause"
@@ -17,6 +17,11 @@ system_accounts="_hitch"
 
 CFLAGS="-fcommon"
 
+post_patch() {
+	vsed -i -e "s/grep -Pq/grep -q/" -e 's/\\t/\t/' \
+		src/tests/test32-proxy-authority.sh
+}
+
 pre_configure() {
 	autoreconf -fi
 }

From 076a11a312e67525d82a05d956740318e5fcc444 Mon Sep 17 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, 1 Jan 2021 00:05:28 +0700
Subject: [PATCH 065/752] e2fsprogs+fatsort: stop breaking masterdir

With diffutils in checkdepends, xbps-src will remove it on do_clean,
which will remove base-chroot.
---
 srcpkgs/e2fsprogs/template | 2 +-
 srcpkgs/fatsort/template   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 5dfcd9d51a3..c301f23ab6c 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -11,7 +11,7 @@ configure_args="--enable-elf-shlibs --disable-fsck
 make_install_args="install-libs"
 hostmakedepends="texinfo pkg-config"
 makedepends="libuuid-devel libblkid-devel"
-checkdepends="diffutils perl"
+checkdepends="perl"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template
index a31c5f1d9a5..5cba67f8dfe 100644
--- a/srcpkgs/fatsort/template
+++ b/srcpkgs/fatsort/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_check_target=tests
 make_install_args="MANDIR=/usr/share/man/man1 SBINDIR=/usr/bin"
-checkdepends="xz dosfstools diffutils valgrind"
+checkdepends="xz dosfstools valgrind"
 short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"

From c04b3ac02c79f19da8e0ce288831eec7c6e00873 Mon Sep 17 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, 1 Jan 2021 00:05:28 +0700
Subject: [PATCH 066/752] srcpkgs: remove gzip from {hostmake,check}depends

With gzip in {hostmake,check}depends, xbps-src will remove it on do_clean,
which will remove base-chroot.
---
 srcpkgs/font-spleen/template | 2 +-
 srcpkgs/mesa/template        | 2 +-
 srcpkgs/texinfo/template     | 2 +-
 srcpkgs/xorg-server/template | 2 +-
 srcpkgs/zziplib/template     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template
index 8ebf0b1022f..1380eb905c8 100644
--- a/srcpkgs/font-spleen/template
+++ b/srcpkgs/font-spleen/template
@@ -6,7 +6,7 @@ wrksrc="spleen-${version}"
 build_style=gnu-makefile
 make_cmd=bmake
 make_build_target="pcf psf"
-hostmakedepends="bmake bdftopcf bdf2psf gzip"
+hostmakedepends="bmake bdftopcf bdf2psf"
 depends="font-util"
 short_desc="Monospaced bitmap fonts"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 97c294cfb9b..abfaa5031ef 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -8,7 +8,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
  -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
  -Dlmsensors=true -Dplatforms=x11,wayland
  -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
-hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip
+hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  wayland-protocols wayland-devel"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index 8b1addad559..94dc718ce7b 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -7,7 +7,7 @@ configure_args="--disable-static --disable-perl-xs"
 hostmakedepends="perl ncurses-devel"
 makedepends="ncurses-devel"
 depends="gzip perl"
-checkdepends="ncurses gzip"
+checkdepends="ncurses"
 short_desc="GNU Documentation System"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index a6a7ca7f4d7..5e48034444e 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -10,7 +10,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
  -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
  -Dxwayland=true"
-hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
+hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template
index 60a6da94452..74c093cff52 100644
--- a/srcpkgs/zziplib/template
+++ b/srcpkgs/zziplib/template
@@ -3,7 +3,7 @@ pkgname=zziplib
 version=0.13.71
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config python3 tar zip gzip"
+hostmakedepends="pkg-config python3 tar zip"
 makedepends="zlib-devel"
 short_desc="Lightweight library to extract data from zip files"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d58e5a8827b9bf143c358f17a5a1917c77dac277 Mon Sep 17 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, 1 Jan 2021 00:05:28 +0700
Subject: [PATCH 067/752] docbook{,-xml}+ghidra: stop breaking masterdir

With bsdtar in {hostmake,check}depends, xbps-src will remove it on do_clean,
which will remove base-chroot.
---
 srcpkgs/docbook-xml/template | 1 -
 srcpkgs/docbook/template     | 1 -
 srcpkgs/ghidra/template      | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template
index b5708c96dc9..b46f1d7646d 100644
--- a/srcpkgs/docbook-xml/template
+++ b/srcpkgs/docbook-xml/template
@@ -3,7 +3,6 @@ pkgname=docbook-xml
 version=4.5
 revision=5
 wrksrc="docbook"
-hostmakedepends="bsdtar"
 makedepends="xmlcatmgr"
 depends="xmlcatmgr"
 short_desc="XML DTD designed for computer documentation"
diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template
index b77b4eb338c..3e5349aa9a4 100644
--- a/srcpkgs/docbook/template
+++ b/srcpkgs/docbook/template
@@ -2,7 +2,6 @@
 pkgname=docbook
 version=4.5
 revision=5
-hostmakedepends="bsdtar"
 depends="xmlcatmgr ISOEnts"
 short_desc="SGML DTD designed for computer documentation"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index b96fb5df84d..8ca5e75d195 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -4,7 +4,7 @@ version=9.2
 revision=1
 archs="x86_64*"
 create_wrksrc=yes
-hostmakedepends="gradle openjdk11 flex bsdtar unzip"
+hostmakedepends="gradle openjdk11 flex unzip"
 depends="openjdk11"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From ea029f546ea4974ca5cb3daf5f4a055a828b75fb Mon Sep 17 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, 4 Jan 2021 07:49:44 +0700
Subject: [PATCH 068/752] rdup: rework do_check

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

diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template
index 82877b9bec5..a73f90839ef 100644
--- a/srcpkgs/rdup/template
+++ b/srcpkgs/rdup/template
@@ -1,12 +1,13 @@
 # Template file for 'rdup'
 pkgname=rdup
 version=1.1.15
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="glib-devel libarchive-devel nettle-devel"
-checkdepends="bsdtar dejagnu"
-short_desc="The only backup program that doesn't make backups"
+depends="bash"
+checkdepends="dejagnu tar gnupg"
+short_desc="Backup program that doesn't make backups"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/miekg/rdup"
@@ -14,7 +15,24 @@ distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz"
 checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb
 patch_args="-Np1"
 
-pre_configure() {
+post_patch() {
 	vsed -e 's/-Werror//' -i GNUmakefile.in
+	vsed -i -e '1i #!/bin/bash' \
+		testsuite/rdup/rdup.hardlink-strip.helper \
+		testsuite/rdup/rdup.hardlink-strip2.helper \
+		testsuite/rdup/rdup.hardlink.helper \
+		testsuite/rdup/rdup.pipeline.helper
+}
+
+pre_configure() {
 	autoreconf -fi
 }
+
+pre_check() {
+	# requires mcrypt
+	rm -f testsuite/rdup/rdup.simple2.*
+	# Pass on manual make check but fail to be run by xbps-src check
+	# Still not figure out the reason
+	rm -f testsuite/rdup/rdup.incr-readonly-dir.exp \
+		testsuite/rdup/rdup.ln-up.exp
+}

From 7501cff661a4f62e9609781a143f04f533a3cdee Mon Sep 17 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, 1 Jan 2021 00:25:33 +0700
Subject: [PATCH 069/752] srcpkgs: remove ncurses from
 {hostmake,make,check}depends

xbps-src will remove ncurses in do_clean, which removes base-chroot
---
 srcpkgs/fbterm/template          | 2 +-
 srcpkgs/ghc-bin/template         | 2 +-
 srcpkgs/gpsd/template            | 2 +-
 srcpkgs/kitty/template           | 2 +-
 srcpkgs/nmh/template             | 2 +-
 srcpkgs/rxvt-unicode/template    | 2 +-
 srcpkgs/texinfo/template         | 1 -
 srcpkgs/util-linux-libs/template | 1 -
 srcpkgs/util-linux/template      | 1 -
 9 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/fbterm/template b/srcpkgs/fbterm/template
index 299914c4b10..f97ecc509dc 100644
--- a/srcpkgs/fbterm/template
+++ b/srcpkgs/fbterm/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="${pkgname}-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-gpm"
-hostmakedepends="pkg-config ncurses"
+hostmakedepends="pkg-config"
 makedepends="fontconfig-devel gpm-devel"
 short_desc="Fast frame buffer based terminal emulator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index b6009ed7c6b..3490190c209 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -4,7 +4,7 @@ version=8.8.4
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
-hostmakedepends="ncurses perl libffi libnuma"
+hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index b4a1d8d5f6e..4198bf21493 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -7,7 +7,7 @@ make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin
  udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"
 make_install_args="$make_build_args"
 make_install_target=udev-install
-hostmakedepends="pkg-config bc python3-pyserial libxslt xmlto asciidoc ncurses"
+hostmakedepends="pkg-config bc python3-pyserial libxslt xmlto asciidoc"
 makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel gtk+3-devel
  pps-tools-devel libcap-devel libbluetooth-devel qt5-devel"
 short_desc="GPS/AIS receiver monitoring daemon"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index f0292dfb5c4..0b1d93b3911 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -3,7 +3,7 @@ pkgname=kitty
 version=0.19.3
 revision=1
 pycompile_dirs="usr/lib/kitty"
-hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols"
+hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
  python3-devel wayland-devel wayland-protocols libcanberra-devel"
 depends="kitty-terminfo-${version}_${revision}"
diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 6906aa7e01b..070ea37e54c 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -5,7 +5,7 @@ revision=5
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
 makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
-checkdepends="groff lynx ncurses tzdata"
+checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 15eaf7d84c3..483d4765916 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -13,7 +13,7 @@ configure_args="
  $(vopt_if perl '--enable-perl' '--disable-perl')
  $(vopt_if startup_notification '--enable-startup-notification' '--disable-startup-notification')
  $(vopt_if unicode3 '--enable-unicode3' '--disable-unicode3')"
-hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf') ncurses"
+hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf')"
 makedepends="xorgproto fontconfig-devel libXrender-devel libXft-devel libSM-devel
  $(vopt_if gdk_pixbuf gdk-pixbuf-devel)
  $(vopt_if perl perl)
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index 94dc718ce7b..c183625028c 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -7,7 +7,6 @@ configure_args="--disable-static --disable-perl-xs"
 hostmakedepends="perl ncurses-devel"
 makedepends="ncurses-devel"
 depends="gzip perl"
-checkdepends="ncurses"
 short_desc="GNU Documentation System"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index 2f639a72e07..53d166ba1e2 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -10,7 +10,6 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
  libmount-${version}_${revision} libsmartcols-${version}_${revision}
  libuuid-${version}_${revision}"
-checkdepends="ncurses" # Some tests require terminfo-entries
 short_desc="Miscellaneous linux utilities - meta libraries"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 8a9a2e30415..2d1f0759537 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -7,7 +7,6 @@ hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
  eudev-libudev-devel"
 depends="util-linux-libs-${version}_${revision}"
-checkdepends="ncurses" # Some tests require terminfo-entries
 short_desc="Miscellaneous linux utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 05783b052dcfa5a036d29b36467ac27192823c12 Mon Sep 17 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, 1 Jan 2021 00:27:02 +0700
Subject: [PATCH 070/752] ncurses: host always has tic(1)

---
 srcpkgs/ncurses/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index f6f70b36e06..90454e01ec1 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -11,10 +11,6 @@ homepage="http://www.gnu.org/software/ncurses/"
 distfiles="${GNU_SITE}/ncurses/$pkgname-$version.tar.gz"
 checksum=30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
 
-if [ "$CROSS_BUILD" ]; then
-	# needs host tic(1)
-	hostmakedepends="ncurses"
-fi
 depends="ncurses-base-${version}_${revision}"
 
 do_configure() {

From 98d3205a3526848d769ab4c825be54aaf19d7941 Mon Sep 17 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, 1 Jan 2021 00:28:45 +0700
Subject: [PATCH 071/752] toilet: don't include file in hostmakedepends

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

diff --git a/srcpkgs/toilet/template b/srcpkgs/toilet/template
index 6153c377466..5c72adad31f 100644
--- a/srcpkgs/toilet/template
+++ b/srcpkgs/toilet/template
@@ -1,23 +1,23 @@
-# Template build file for 'toilet'
+# Template file for 'toilet'
 pkgname=toilet
 version=0.3
-revision=2
+revision=3
 build_style=gnu-configure
-short_desc="a program for making large letters out of ordinary text"
+hostmakedepends="pkg-config unzip"
+makedepends="libcaca-devel"
+short_desc="Program for making large letters out of ordinary text"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="WTFPL"
 homepage="http://caca.zoy.org/wiki/toilet"
-hostmakedepends="pkg-config file unzip"
-makedepends="libcaca-devel"
 distfiles="http://caca.zoy.org/raw-attachment/wiki/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=89d4b530c394313cc3f3a4e07a7394fa82a6091f44df44dfcd0ebcb3300a81de
 
-post_install() {
-	# Extract ZIP Files
-
-	for i in $DESTDIR/usr/share/figlet/*.tlf; do
-		file --mime-type -b -- "$i" | grep -xF "application/zip" || continue
-		unzip -p -- "$i" > "${i}.out"
-		mv ${i}.out ${i}
+post_extract() {
+	find fonts |
+	file --mime-type --files-from - |
+	awk -F: '/application\/zip$/ {print $1}' |
+	while read _file; do
+		unzip -p -- "$_file" >"$_file.out"
+		mv "$_file.out" "$_file"
 	done
 }

From f36a5dd6e8214593de17417983d9978debcf555e Mon Sep 17 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, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 072/752] freetype: clean XBPS_CROSS_TRIPLET reference in
 freetype-config

* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
  $XBPS_CROSS_BASE will be prepended twice with current system,
  let's fix it.
---
 common/hooks/pre-configure/02-script-wrapper.sh | 15 ++++++++++++++-
 srcpkgs/freetype/template                       |  6 +++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..9ca195d5a58 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
 	done
 }
 
+link_wrapper() {
+	local wrapper="$1"
+	[ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+	[ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+	ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
 hook() {
 	export PATH="$XBPS_WRAPPERDIR:$PATH"
 
@@ -186,9 +193,15 @@ hook() {
 	pkgconfig_wrapper
 	vapigen_wrapper
 	valac_wrapper
+
+	if [ -x /usr/bin/pkg-config ]; then
+		link_wrapper freetype-config
+	else
+		generic_wrapper freetype-config
+	fi
+
 	generic_wrapper icu-config
 	generic_wrapper libgcrypt-config
-	generic_wrapper freetype-config
 	generic_wrapper sdl-config
 	generic_wrapper sdl2-config
 	generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..ba4c6ad900c 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
 version=2.10.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
 
+post_patch() {
+	vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
+}
+
 post_install() {
 	vlicense docs/LICENSE.TXT
 	vlicense docs/FTL.TXT

From 4abdf0e7e67bb1df295807057f4abccb7a08ebcd Mon Sep 17 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 Jan 2021 19:25:37 +0700
Subject: [PATCH 073/752] SDL_ttf: remove unnecessary CFLAGS

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

diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 72293431f32..a6856a297bc 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -1,19 +1,21 @@
 # Template file for 'SDL_ttf'
 pkgname=SDL_ttf
 version=2.0.11
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="freetype-devel SDL-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://www.libsdl.org/projects/${pkgname}"
+license="Zlib"
+homepage="http://www.libsdl.org/projects/SDL_ttf"
 distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
 checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
 
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
+post_install() {
+	vlicense COPYING
+}
 
 SDL_ttf-devel_package() {
 	depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"

From cf9beb9f76d9c7d375d50b03257c5f55e9929e78 Mon Sep 17 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 Jan 2021 19:25:37 +0700
Subject: [PATCH 074/752] libopenshot-audio: remove unnecessary CXXFLAGS

---
 srcpkgs/libopenshot-audio/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
index d9a6a719734..56c330eafcf 100644
--- a/srcpkgs/libopenshot-audio/template
+++ b/srcpkgs/libopenshot-audio/template
@@ -13,8 +13,6 @@ homepage="https://github.com/OpenShot/libopenshot-audio"
 distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz"
 checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309
 
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	CXXFLAGS+=" -latomic "

From 3d544d7a387ed82f67985c3b0842d210afd213de Mon Sep 17 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 Jan 2021 19:25:37 +0700
Subject: [PATCH 075/752] tumbler: remove unnecessary CFLAGS

---
 srcpkgs/tumbler/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index fe37a85871a..dcdd7cfd40e 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -14,8 +14,6 @@ homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
 
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
 tumbler-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 1a64cfcdab3701bedd115c43f6d4f0e2180ca972 Mon Sep 17 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 Jan 2021 19:47:18 +0700
Subject: [PATCH 076/752] wmx: simply template

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

diff --git a/srcpkgs/wmx/template b/srcpkgs/wmx/template
index 32cd09e57b9..6e24a5419bb 100644
--- a/srcpkgs/wmx/template
+++ b/srcpkgs/wmx/template
@@ -1,15 +1,14 @@
 # Template file for 'wmx'
 pkgname=wmx
 version=8
-revision=3
+revision=4
 build_style=gnu-configure
-make_build_args="LDFLAGS+=-lXft LDFLAGS+=-lfontconfig
- CXXFLAGS+=-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel freetype-devel
- libXft-devel fontconfig-devel libXcomposite-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel
+ freetype-devel libXft-devel fontconfig-devel libXcomposite-devel"
 short_desc="Simple window manager for X"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://www.all-day-breakfast.com/wmx"
 distfiles="http://www.all-day-breakfast.com/wmx/wmx-${version}.tar.gz"
 checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
@@ -17,4 +16,8 @@ checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
 do_install() {
 	vbin wmx
 	vinstall ${FILESDIR}/wmx.desktop 644 usr/share/xsessions
+	vlicense README
+	vlicense README.contrib
+	sed -ne '4,13p' Rotated.C >LICENSE.xvertext
+	vlicense LICENSE.xvertext
 }

From 7e751cf3e15864fed79baa16fc3d4ac9d5b8c62c Mon Sep 17 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 Jan 2021 19:57:25 +0700
Subject: [PATCH 077/752] slim: simplify template

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

diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b86c951e188..b7382cac308 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -3,8 +3,7 @@ pkgname=slim
 version=1.3.6
 revision=13
 build_style=cmake
-configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes
- -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
+configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
 conf_files="/etc/slim.conf /etc/pam.d/slim"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel freetype-devel libjpeg-turbo-devel libXrandr-devel
@@ -21,11 +20,8 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) CXXFLAGS="-DNEEDS_BASENAME";;
 esac
 
-pre_configure() {
-	sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
-}
 post_install() {
 	vsv slim
 	vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
-	rm -rf ${DESTDIR}/usr/lib/systemd
+	rm -rf ${DESTDIR}/lib/systemd
 }

From c02eafc8571891b6089c5140972e8d37c4b33c7a Mon Sep 17 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 Jan 2021 19:57:44 +0700
Subject: [PATCH 078/752] texlive: remove freetype2-config hacks

---
 srcpkgs/texlive/template | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index f416e853534..42d7bfcdf45 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -172,16 +172,6 @@ post_patch() {
 	popd
 }
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ] ; then
-		# For some reason, when cross-building, the configure script has this path
-		# for freetype2 include:
-		# /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2.
-		# It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS.
-		CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-	fi
-}
-
 pre_build() {
 	if [ -n "$build_option_luajit" ] ; then
 		export HOST_CC="${_luajit_host_cc}"

From 6bb6ee08ca4828f80a205abfb569eb254b8b3c73 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 4 Jan 2021 20:34:21 +0100
Subject: [PATCH 079/752] openradtool: update to 0.11.10.

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

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

From 22ff124cfa1937d8fda3550da4345c2b14f86dad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Jan 2021 01:26:37 +0100
Subject: [PATCH 080/752] umurmur: update to 0.2.18.

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

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 02d6cd0f965..eac7c275465 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,7 +1,7 @@
 # Template file for 'umurmur'
 pkgname=umurmur
-version=0.2.17
-revision=7
+version=0.2.18
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
@@ -9,10 +9,10 @@ hostmakedepends="automake libtool"
 makedepends="libconfig-devel libressl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="3-clause-BSD"
+license="BSD-3-clause"
 homepage="http://umurmur.net/"
 distfiles="https://github.com/umurmur/umurmur/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2
+checksum=f72c2fe802c8ab2c8dc66eb5da1fbe0c3ee73aef16abf06bba94cc69e595354f
 
 system_accounts="umurmur"
 umurmur_homedir="/var/lib/umurmur"
@@ -20,7 +20,7 @@ make_dirs="/var/lib/umurmur 0750 umurmur umurmur"
 
 pre_configure() {
 	./autogen.sh
-	sed -i \
+	vsed -i \
 		-e 's/# username = "";/username = "umurmur";/' \
 		-e 's/# groupname = "";/groupname = "umurmur";/' \
 		umurmur.conf.example

From df5dffb14c52dc0bc0d683d0659f1d9c7362a21e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 5 Jan 2021 01:09:52 +0200
Subject: [PATCH 081/752] notcurses: update to 2.1.4.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 11002c5a5d5..58c6d74d974 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -13,7 +13,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=5c83bbfaea4457d482f0b3be07150fa6051651d97fb56d9f7811e4b2d6771d0a
+checksum=4f40991efc0e46b34d6017a0628097888bcd2ed4bfce6d129debd056dd1ef449
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From c524f5271af32b6bd2deb3b17a231d5c0d6f8db9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 4 Jan 2021 22:09:00 +0200
Subject: [PATCH 082/752] xfce4-whiskermenu-plugin: update to 2.5.1.

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

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 06942cca065..85d226fe040 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,14 +1,14 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.4.6
+version=2.5.1
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
-maintainer="Giedrius Statkevičius <giedriuswork@gmail.com>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=8974d38cc87df528693efe4b6e14bcd233cdb49d2018a23ddddf745110b25744
+checksum=b2074f8a9caa766e2d97f0b960ef2f4d1e20dd804497229bc1f0157791896925

From 3e9c2a69d13e766b93a735ef442d4f437baaff6f Mon Sep 17 00:00:00 2001
From: tommyjanna <25873341+tommyjanna@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:06:13 -0500
Subject: [PATCH 083/752] python3-lazy-object-proxy: update to 1.5.2.

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

diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
index 9ad5a7ed0db..5fe116ab439 100644
--- a/srcpkgs/python3-lazy-object-proxy/template
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-lazy-object-proxy'
 pkgname=python3-lazy-object-proxy
-version=1.5.1
+version=1.5.2
 revision=1
 wrksrc="lazy-object-proxy-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/ionelmc/python-lazy-object-proxy"
 distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
-checksum=9723364577b79ad9958a68851fe2acb94da6fd25170c595516a8289e6a129043
+checksum=5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4
 
 post_install() {
 	vlicense LICENSE

From a5d732c0fc266544173a79cb7475ec0c839b3e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 22:58:53 -0300
Subject: [PATCH 084/752] s6-networking: switch to BearSSL as default.

Generally preferred by upstream and will ease a transition to OpenSSL.
---
 srcpkgs/s6-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index e53eca35a33..d3a33e7b7ef 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
 version=2.3.2.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
  $(vopt_if bearssl --enable-ssl=bearssl)
@@ -18,7 +18,7 @@ distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=bbe36a8460d90f3bff56c934811876186f7224ced5bdc15c2c96d49b4e917d12
 
 build_options="bearssl libressl"
-build_options_default="libressl"
+build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
 desc_option_libressl="Use LibreSSL as SSL library"
 vopt_conflict bearssl libressl

From c5a9b5ed5fadfcb94797ef9b58f219b801b5eb27 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 21:38:11 +1100
Subject: [PATCH 085/752] gitea: update to 1.13.1.

---
 srcpkgs/gitea/patches/config.patch | 58 ++++++++++++++----------------
 srcpkgs/gitea/template             |  6 ++--
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch
index e5833d9a31b..c5238253ccf 100644
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@@ -1,33 +1,29 @@
---- custom/conf/app.ini.sample.orig	2020-06-22 08:49:03.000000000 +1000
-+++ custom/conf/app.ini.sample	2020-07-10 10:53:31.047000000 +1000
-@@ -7,12 +7,12 @@
+--- custom/conf/app.example.ini	2020-12-29 05:19:36.000000000 +1100
++++ custom/conf/app.example.ini	2021-01-04 20:50:52.849861177 +1100
+@@ -7,7 +7,7 @@
  ; App name that shows in every page title
  APP_NAME = Gitea: Git with a cup of tea
  ; Change it if you run locally
 -RUN_USER = git
 +RUN_USER = _gitea
- ; Either "dev", "prod" or "test", default is "dev"
--RUN_MODE = dev
-+RUN_MODE = prod
+ ; Application run mode, affects performance and debugging. Either "dev", "prod" or "test", default is "prod"
+ RUN_MODE = prod
+ 
+@@ -17,7 +17,7 @@
+ PROJECT_BOARD_BUG_TRIAGE_TYPE = Needs Triage, High Priority, Low Priority, Closed
  
  [repository]
 -ROOT =
 +ROOT = /var/lib/gitea/repositories
  SCRIPT_TYPE = bash
- ; Default ANSI charset
- ANSI_CHARSET =
-@@ -62,16 +62,16 @@
- PREVIEWABLE_FILE_MODES = markdown
+ ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets.
+ ; If the charsets have equal confidence, tie-breaking will be done by order in this list
+@@ -81,13 +81,13 @@
  
  [repository.local]
--; Path for local repository copy. Defaults to `tmp/local-repo`
+ ; Path for local repository copy. Defaults to `tmp/local-repo`
 -LOCAL_COPY_PATH = tmp/local-repo
--; Path for local wiki copy. Defaults to `tmp/local-wiki`
--LOCAL_WIKI_PATH = tmp/local-wiki
-+; Path for local repository copy. Defaults to `/var/lib/gitea/tmp/local-repo`
 +LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo
-+; Path for local wiki copy. Defaults to `/var/lib/gitea/tmp/local-wiki`
-+LOCAL_WIKI_PATH = /var/lib/gitea/tmp/local-wiki
  
  [repository.upload]
  ; Whether repository file uploads are enabled. Defaults to `true`
@@ -35,10 +31,10 @@
  ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart)
 -TEMP_PATH = data/tmp/uploads
 +TEMP_PATH = /var/lib/gitea/tmp/uploads
- ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
+ ; Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types.
  ALLOWED_TYPES =
  ; Max size of each file in megabytes. Defaults to 3MB
-@@ -248,7 +248,7 @@
+@@ -272,7 +272,7 @@
  REDIRECT_OTHER_PORT = false
  PORT_TO_REDIRECT = 80
  ; Permission for unix socket
@@ -47,7 +43,7 @@
  ; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service.
  ; In most cases you do not need to change the default value.
  ; Alter it only if your SSH server node is not the same as HTTP node.
-@@ -269,7 +269,7 @@
+@@ -293,7 +293,7 @@
  ; The port number the builtin SSH server should listen on
  SSH_LISTEN_PORT = %(SSH_PORT)s
  ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
@@ -56,7 +52,7 @@
  ; Gitea will create a authorized_keys file by default when it is not using the internal ssh server
  ; If you intend to use the AuthorizedKeysCommand functionality then you should turn this off.
  SSH_CREATE_AUTHORIZED_KEYS_FILE = true
-@@ -308,7 +308,7 @@
+@@ -354,7 +354,7 @@
  KEY_FILE = https/key.pem
  ; Root directory containing templates and static files.
  ; default is the path where Gitea is executed
@@ -65,7 +61,7 @@
  ; Default path for App data
  APP_DATA_PATH = data
  ; Application level GZIP support
-@@ -325,7 +325,7 @@
+@@ -371,7 +371,7 @@
  ; Enables git-lfs support. true or false, default is false.
  LFS_START_SERVER = false
  ; Where your lfs files reside, default is data/lfs.
@@ -74,7 +70,7 @@
  ; LFS authentication secret, change this yourself
  LFS_JWT_SECRET =
  ; LFS authentication validity period (in time.Duration), pushes taking longer than this may fail.
-@@ -355,7 +355,7 @@
+@@ -401,7 +401,7 @@
  
  [database]
  ; Database to use. Either "mysql", "postgres", "mssql" or "sqlite3".
@@ -83,16 +79,16 @@
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -372,7 +372,7 @@
+@@ -418,7 +418,7 @@
  ; NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this.
- CHARSET = utf8
+ CHARSET = utf8mb4
  ; For "sqlite3" and "tidb", use an absolute path when you start gitea as service
 -PATH = data/gitea.db
 +PATH = /var/lib/gitea/data/gitea.db
  ; For "sqlite3" only. Query timeout
  SQLITE_TIMEOUT = 500
  ; For iterate buffer, default is 50
-@@ -398,7 +398,7 @@
+@@ -444,7 +444,7 @@
  ; Issue indexer name, available when ISSUE_INDEXER_TYPE is elasticsearch
  ISSUE_INDEXER_NAME = gitea_issues
  ; Issue indexer storage path, available when ISSUE_INDEXER_TYPE is bleve
@@ -101,7 +97,7 @@
  ; Issue indexer queue, currently support: channel, levelqueue or redis, default is levelqueue
  ISSUE_INDEXER_QUEUE_TYPE = levelqueue
  ; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the queue will be saved path,
-@@ -706,7 +706,7 @@
+@@ -773,7 +773,7 @@
  SESSION_LIFE_TIME = 86400
  
  [picture]
@@ -110,7 +106,7 @@
  REPOSITORY_AVATAR_UPLOAD_PATH = data/repo-avatars
  ; How Gitea deals with missing repository avatars
  ; none = no avatar will be displayed; random = random avatar will be displayed; image = default image will be used
-@@ -751,7 +751,7 @@
+@@ -838,7 +838,7 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -119,16 +115,16 @@
  ; Either "console", "file", "conn", "smtp" or "database", default is "console"
  ; Use comma to separate multiple modes, e.g. "console, file"
  MODE = console
-@@ -968,14 +968,6 @@
- sv-SE = sv
- ko-KR = ko
+@@ -1132,14 +1132,6 @@
+ LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pt-PT,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
+ NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,Português de Portugal,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어
  
 -[U2F]
 -; NOTE: THE DEFAULT VALUES HERE WILL NEED TO BE CHANGED
 -; Two Factor authentication with security keys
 -; https://developers.yubico.com/U2F/App_ID.html
 -;APP_ID = http://localhost:3000/
--; Comma seperated list of trusted facets
+-; Comma separated list of trusted facets
 -;TRUSTED_FACETS = http://localhost:3000/
 -
  ; Extension mapping to highlight class
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index e96ecf7d08b..ed6d4e9ce10 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.12.6
+version=1.13.1
 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=98486d15c58b52177e58af300e1ac6afa46f2f85f61b8d96eacbbf73ccf1191e
+checksum=b5a87b722abe8e4911389abf57ec8f46d58fb966929dfe612a77639e27ec4187
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"
@@ -48,5 +48,5 @@ pre_build() {
 post_install() {
 	vlicense LICENSE
 	vsv gitea
-	vinstall custom/conf/app.ini.sample 0640 /etc gitea.conf
+	vinstall custom/conf/app.example.ini 0640 /etc gitea.conf
 }

From 53c5f2f3efb31747c734ba07485a01d02dcdc500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 3 Jan 2021 07:04:35 +0100
Subject: [PATCH 086/752] python3-mtranslate: update to 1.8.

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

diff --git a/srcpkgs/python3-mtranslate/template b/srcpkgs/python3-mtranslate/template
index 613d1e96c4d..fe4beff7487 100644
--- a/srcpkgs/python3-mtranslate/template
+++ b/srcpkgs/python3-mtranslate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mtranslate'
 pkgname=python3-mtranslate
-version=1.6
-revision=4
+version=1.8
+revision=1
 wrksrc="mtranslate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/mouuff/mtranslate"
 distfiles="https://github.com/mouuff/mtranslate/archive/${version}.tar.gz"
-checksum=58fe274c692717a6e22acaf8712014a4ba1bd9a09409d246f31796f6f0117385
+checksum=cbba819e6a6a87d68e6cd6b4c7d6581a589dcc1a4fa145b7d3a6ffe901413196
 
 post_install() {
 	vlicense LICENSE

From a4b812a68166bb61d00048c4343151645481aecb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 3 Jan 2021 16:44:17 +0200
Subject: [PATCH 087/752] growlight: update to 1.2.26.

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index ef690e3baec..650cfceac6c 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.25
+version=1.2.26
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=e7d1a9883489ade3ceb6a4816ec2e22074ea8cc68c8a0782f5b99e2d1f1b7e1c
+checksum=fd44f4b6fdec3200c539dcb520347634727872dfffada98433162eb824903bfb
 
 build_options="man zfs"
 

From b15da31a8bcb27874fdfac7bea92a0c0475825c7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 3 Jan 2021 16:32:56 +0100
Subject: [PATCH 088/752] fatsort: add update file

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

diff --git a/srcpkgs/fatsort/update b/srcpkgs/fatsort/update
new file mode 100644
index 00000000000..051be51527b
--- /dev/null
+++ b/srcpkgs/fatsort/update
@@ -0,0 +1 @@
+site='https://sourceforge.net/projects/fatsort/files/'

From 0154099c1a7c5dfaf1dfc680856b9f0f10d4287a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sun, 3 Jan 2021 00:04:55 -0800
Subject: [PATCH 089/752] jetbrains-jdk-bin: update to 11.0.9.1b1244.2.

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

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 0e97321dfb0..0d4f25e8b2b 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.9.1b1207.1
+version=11.0.9.1b1244.2
 revision=1
 archs="x86_64"
 wrksrc="jbrsdk"
@@ -12,8 +12,8 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://dl.bintray.com/jetbrains/intellij-jbr/jbrsdk-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=a7537c2d8bc1fa83858e6bdccd4da006b5599a0649b9a6d61b93e4f714a10ee1
-fetch_cmd="wget"
+checksum=d0b47b6a8981da8c457642b7b35462e1711f6ec339bd1ba29f62f1173f172c04
+fetch_cmd="wget --quiet"
 # 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 2e2cb94474d6c8012e7fb12f4b67e479bbbf63d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 3 Jan 2021 16:58:44 +0100
Subject: [PATCH 090/752] trash-cli: update to 0.20.12.26.

Also add depends and checkdepends, taken from requirements.txt and
requirements-dev.txt.

Closes: #27637 [via git-merge-pr]
---
 srcpkgs/trash-cli/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template
index d1e28aca412..b2819de5e82 100644
--- a/srcpkgs/trash-cli/template
+++ b/srcpkgs/trash-cli/template
@@ -1,13 +1,14 @@
 # Template file for 'trash-cli'
 pkgname=trash-cli
-version=0.17.1.14
-revision=3
+version=0.20.12.26
+revision=1
 build_style=python3-module
 hostmakedepends="python3"
-depends="python3"
+depends="python3-psutil"
+checkdepends="$depends python3-pytest python3-six python3-mock"
 short_desc="Command line interface to the freedesktop.org trashcan"
 maintainer="Anjandev Momi <anjan@momi.ca>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/andreafrancia/trash-cli"
 distfiles="https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz"
-checksum=8fdd20e5e9c55ea4e24677e602a06a94a93f1155f9970c55b25dede5e037b974
+checksum=06173eaca9b7fbda661ac7d84f900c7f4d17db5dd6ee4b3617bcf2182cde0f31

From 3ffa6576b49948c8b2f61aa22b3f811e0222ea02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 3 Jan 2021 19:24:05 +0100
Subject: [PATCH 091/752] apache-ant: update to 1.10.9.

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

diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template
index a4ec359fe20..016a341e0e1 100644
--- a/srcpkgs/apache-ant/template
+++ b/srcpkgs/apache-ant/template
@@ -1,7 +1,7 @@
 # Template file for 'apache-ant'
 pkgname=apache-ant
-version=1.10.8
-revision=2
+version=1.10.9
+revision=1
 hostmakedepends="openjdk8"
 depends="virtual?java-runtime"
 short_desc="Java library and command-line tool that help building software"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://ant.apache.org"
 distfiles="https://archive.apache.org/dist/ant/source/apache-ant-${version}-src.tar.xz"
-checksum=40570314bad3b46abe4ee0669a8f8feb56fe767f1642a801fa7fd4fafcd362ca
+checksum=4b2008cc60fefd424b05567e9d43a071302865d5fd8b01a807e15e381b557ec2
 python_version=2 # only script uses python2-isms like print ""
 
 nocross=yes

From d7940694991d34202c96b687053e015d909c2f45 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 2 Jan 2021 11:07:26 +1100
Subject: [PATCH 092/752] libupnpp: update to 0.20.2

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

diff --git a/srcpkgs/libupnpp/template b/srcpkgs/libupnpp/template
index 43a303081a7..92cbb9bb1dd 100644
--- a/srcpkgs/libupnpp/template
+++ b/srcpkgs/libupnpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libupnpp'
 pkgname=libupnpp
-version=0.20.1
+version=0.20.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-${version}.tar.gz"
-checksum=d4da986aeaa7124a1732ce3383b6ac8f28e20cab10f1916709f39e5499ae9c38
+checksum=48c2cc7b5a3eef55f4dddda88d8676ed11f7e88f1d6680c8458512067a0e0a11
 
 libupnpp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From de0e0e0029389c262468c6d8e2d62f2e194a5f97 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 2 Jan 2021 11:16:54 +1100
Subject: [PATCH 093/752] upmpdcli: update to 1.5.7

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

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index f2218c45695..99eb988d948 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.5
+version=1.5.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=45fce9c71a45f1ec0d1cb2924bf7ece444c44a918a0c437c1c768baa3d4a345d
+checksum=37ccd3bf24641eab979fa6bb143554384e24f954bcbd98488ce7334235dab0e3
 python_version=3
 
 system_accounts="_upmpdcli"

From 85bac7d6654a56a0bb7ca4eff09cd958e37e1c07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 2 Jan 2021 09:14:43 -0500
Subject: [PATCH 094/752] samba: update to 4.13.3.

Also revert private lib changes in da2cea569c8bcda165729b0a29555ab9ef320f76
that seem to break some installations.

Fixes #27565.
---
 common/shlibs                |  9 +++++++++
 srcpkgs/samba/REMOVE         |  7 -------
 srcpkgs/samba/files/nmbd/run |  3 +++
 srcpkgs/samba/files/smbd/run |  3 +++
 srcpkgs/samba/template       | 34 ++++++++++++++++++----------------
 srcpkgs/samba/update         |  2 +-
 6 files changed, 34 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/samba/REMOVE

diff --git a/common/shlibs b/common/shlibs
index 26a6259f6d2..d9319f0c221 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,15 +4004,19 @@ libnss_winbind.so.2 samba-4.13.2_1
 libnss_wins.so.2 samba-4.13.2_1
 libsamba-policy.so.0 samba-4.13.2_1
 libauth-unix-token-samba4.so samba-4.13.2_1
+libauth4-samba4.so samba-4.13.3_1
 libdcerpc-samba4.so samba-4.13.2_1
 libdsdb-module-samba4.so samba-4.13.2_1
 libgpext-samba4.so samba-4.13.2_1
+libnet-keytab-samba4.so samba-4.13.3_1
 libposix-eadb-samba4.so samba-4.13.2_1
 libprinting-migrate-samba4.so samba-4.13.2_1
 libsamba-net-samba4.so samba-4.13.2_1
+libsamba-python-samba4.so samba-4.13.3_1
 libshares-samba4.so samba-4.13.2_1
 libsmbd-base-samba4.so samba-4.13.2_1
 libsmbd-conn-samba4.so samba-4.13.2_1
+libsmbpasswordparser-samba4.so samba-4.13.3_1
 libxattr-tdb-samba4.so samba-4.13.2_1
 libdcerpc.so.0 samba-libs-4.13.2_1
 libdcerpc-binding.so.0 samba-libs-4.13.2_1
@@ -4032,11 +4036,16 @@ libsmbldap.so.2 samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libcli-ldap-samba4.so samba-libs-4.13.2_1
 libcliauth-samba4.so samba-libs-4.13.2_1
+libcluster-samba4.so samba-libs-4.13.3_1
 libcommon-auth-samba4.so samba-libs-4.13.2_1
 libdcerpc-samba-samba4.so samba-libs-4.13.2_1
+libflag-mapping-samba4.so samba-libs-4.13.3_1
 libgpo-samba4.so samba-libs-4.13.2_1
+libiov-buf-samba4.so samba-libs-4.13.3_1
 libndr-samba-samba4.so samba-libs-4.13.2_1
 libndr-samba4.so samba-libs-4.13.2_1
+libprinter-driver-samba4.so samba-libs-4.13.3_1
 libsmb-transport-samba4.so samba-libs-4.13.2_1
+libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
diff --git a/srcpkgs/samba/REMOVE b/srcpkgs/samba/REMOVE
deleted file mode 100644
index c7b0c440d37..00000000000
--- a/srcpkgs/samba/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case ${ACTION} in
-purge)
-	[ -d var/samba ] && rm -rf var/samba
-	[ -d var/spool/samba ] && rm -rf var/spool/samba
-	[ -d etc/samba/private ] && rm -rf etc/samba/private
-	;;
-esac
diff --git a/srcpkgs/samba/files/nmbd/run b/srcpkgs/samba/files/nmbd/run
index 607ee84efab..c27f740c349 100755
--- a/srcpkgs/samba/files/nmbd/run
+++ b/srcpkgs/samba/files/nmbd/run
@@ -1,3 +1,6 @@
 #!/bin/sh
+
 mkdir -p /run/samba
+mkdir -p /run/lock/samba
+
 exec nmbd -F -S
diff --git a/srcpkgs/samba/files/smbd/run b/srcpkgs/samba/files/smbd/run
index b702175b626..136e19788ae 100755
--- a/srcpkgs/samba/files/smbd/run
+++ b/srcpkgs/samba/files/smbd/run
@@ -1,3 +1,6 @@
 #!/bin/sh
+
 mkdir -p /run/samba
+mkdir -p /run/lock/samba
+
 exec smbd -F -S
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 646546a27bb..cb5eaf45376 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,15 +1,16 @@
 # Template file for 'samba'
 pkgname=samba
-version=4.13.2
-revision=3
+version=4.13.3
+revision=1
 build_style=waf3
 build_helper="qemu"
 configure_script="buildtools/bin/waf"
 _idmap_modules="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
 _pdb_modules="pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
 _auth_modules="auth_unix,auth_wbc,auth_server,auth_netlogind,autH_script,auth_samba4"
-configure_args="--enable-fhs --sbindir=/usr/bin --localstatedir=/var
- --sysconfdir=/etc --with-piddir=/run/samba --with-sockets-dir=/run/samba
+configure_args="--enable-fhs --sbindir=/usr/bin
+ --localstatedir=/var --sysconfdir=/etc --with-piddir=/run/samba
+ --with-sockets-dir=/run/samba --with-lockdir=/run/lock/samba
  --with-privatedir=/etc/samba/private --with-pammodulesdir=/usr/lib/security
  --with-modulesdir=/usr/lib/samba --disable-rpath --disable-rpath-install
  --without-systemd --without-gettext --bundled-libraries=NONE
@@ -26,7 +27,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.samba.org"
 distfiles="http://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz"
-checksum=276464396a05d88b775bda01ac2eb1e5a636ccf7010b0fd28efc3d85583af2b4
+checksum=c10585d43f33656fe4e1f9ff8bf40ea57d8d5b653521c1cc198fbf4922756541
 lib32disabled=yes
 conf_files="/etc/pam.d/samba /etc/samba/smb.conf"
 make_dirs="/etc/samba/private 0750 root root"
@@ -45,16 +46,16 @@ fi
 # that shouldn't be exposed locally. For those that cannot be built in, make
 # sure to install them into /usr/lib so xbps-src picks them up.
 _privlibs="CHARSET3 MESSAGING_SEND MESSAGING LIBWBCLIENT_OLD addns ads \
- asn1util auth auth4 authkrb5 cmdline_contexts cmdline-credentials cli_cldap \
- cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns cluster common-auth \
- dbwrap events flag_mapping genrand gensec gse http interfaces iov_buf krb5samba \
- ldbsamba libcli_lsa3 libcli_netlogon3 libsmb messages_dgm messages_util mscat \
- msghdr msrpc3 netif net_keytab npa_tstream popt_samba3 popt_samba3_cmdline \
- printer_driver registry replace samba-cluster-support samba-debug \
+ asn1util auth authkrb5 cmdline_contexts cmdline-credentials cli_cldap \
+ cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns common-auth \
+ ctdb-event-client dbwrap events genrand gensec gse http interfaces \
+ krb5samba ldbsamba libcli_lsa3 libcli_netlogon3 libsmb messages_dgm \
+ messages_util mscat msghdr msrpc3 netif npa_tstream popt_samba3 \
+ popt_samba3_cmdline registry replace samba-cluster-support samba-debug \
  samba-modules samba-security samba-sockets samba3-util samdb-common secrets3 \
- server_id_db server-role samba_python smbclient-raw smbd_shim smbpasswdparser \
- socket-blocking sys_rw talloc_report_printf talloc_report tdb-wrap tevent-util \
- time-basic torture trusts_util util_reg util_setid util_tdb ctdb-event-client"
+ server_id_db server-role smbclient-raw smbd_shim socket-blocking sys_rw \
+ talloc_report_printf talloc_report tevent-util time-basic trusts_util \
+ util_reg util_setid util_tdb"
 configure_args+=" --with-privatelibdir=/usr/lib --builtin-libraries=${_privlibs// /,}"
 
 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
@@ -173,8 +174,9 @@ samba-libs_package() {
 		_libs="dcerpc dcerpc-binding ndr-krb5pac ndr-nbt ndr-standard ndr
 		 samba-credentials samba-errors samba-hostconfig samba-passdb
 		 samba-util samdb smbclient smbconf smbldap wbclient"
-		_privlibs="cli-ldap cliauth common-auth dcerpc-samba gpo
-		 ndr-samba ndr smb-transport util-cmdline winbind-client"
+		_privlibs="cli-ldap cliauth cluster common-auth dcerpc-samba
+		 flag-mapping gpo iov-buf ndr-samba ndr printer-driver
+		 smb-transport tdb-wrap util-cmdline winbind-client"
 
 		for _lib in ${_libs}; do
 			vmove "usr/lib/lib${_lib}.so.*"
diff --git a/srcpkgs/samba/update b/srcpkgs/samba/update
index 9b5cdbfb10f..7a794aa66ec 100644
--- a/srcpkgs/samba/update
+++ b/srcpkgs/samba/update
@@ -1 +1 @@
-ignore="4.* *rc[0-9] *a *b"
+ignore="*rc[0-9] *a *b"

From 39019393f5ce50584f63b5e085d9af249b6c267d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 2 Jan 2021 09:15:55 -0500
Subject: [PATCH 095/752] cifs-utils: update to 6.12.

---
 .../patches/cifs.upall-setcap.patch           | 51 -------------------
 .../patches/mount.cifs-setcap.patch           | 51 -------------------
 srcpkgs/cifs-utils/template                   |  6 +--
 3 files changed, 3 insertions(+), 105 deletions(-)
 delete mode 100644 srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
 delete mode 100644 srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch

diff --git a/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch b/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
deleted file mode 100644
index 376c8e1d512..00000000000
--- a/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From linux-cifs  Sat Nov 21 11:11:45 2020
-From: Jonas Witschel <diabonas () archlinux ! org>
-Date: Sat, 21 Nov 2020 11:11:45 +0000
-To: linux-cifs
-Subject: [PATCH 2/2] cifs.upall: update the cap bounding set only when CAP_SETPCAP is given
-Message-Id: <20201121111145.24975-3-diabonas () archlinux ! org>
-X-MARC-Message: https://marc.info/?l=linux-cifs&m=160595758021261
-
-libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error
-of -4 when trying to update the capability bounding set without having the
-CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng
-silently skipped updating the bounding set and only updated the normal
-CAPNG_SELECT_CAPS capabilities instead.
-
-Check beforehand whether we have CAP_SETPCAP, in which case we can use
-CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set.
-Otherwise, we can at least update the normal capabilities, but refrain from
-trying to update the bounding set to avoid getting an error.
-
-Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
----
- cifs.upcall.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cifs.upcall.c b/cifs.upcall.c
-index 1559434..af1a0b0 100644
---- cifs.upcall.c
-+++ cifs.upcall.c
-@@ -88,6 +88,8 @@ typedef enum _sectype {
- static int
- trim_capabilities(bool need_environ)
- {
-+	capng_select_t set = CAPNG_SELECT_CAPS;
-+
- 	capng_clear(CAPNG_SELECT_BOTH);
- 
- 	/* SETUID and SETGID to change uid, gid, and grouplist */
-@@ -105,7 +107,10 @@ trim_capabilities(bool need_environ)
- 		return 1;
- 	}
- 
--	if (capng_apply(CAPNG_SELECT_BOTH)) {
-+	if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
-+		set = CAPNG_SELECT_BOTH;
-+	}
-+	if (capng_apply(set)) {
- 		syslog(LOG_ERR, "%s: Unable to apply capability set: %m\n", __func__);
- 		return 1;
- 	}
--- 
-2.29.2
diff --git a/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch b/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch
deleted file mode 100644
index 74f17240469..00000000000
--- a/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From linux-cifs  Sat Nov 21 11:11:44 2020
-From: Jonas Witschel <diabonas () archlinux ! org>
-Date: Sat, 21 Nov 2020 11:11:44 +0000
-To: linux-cifs
-Subject: [PATCH 1/2] mount.cifs: update the cap bounding set only when CAP_SETPCAP is given
-Message-Id: <20201121111145.24975-2-diabonas () archlinux ! org>
-X-MARC-Message: https://marc.info/?l=linux-cifs&m=160595758021264
-
-libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error
-of -4 when trying to update the capability bounding set without having the
-CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng
-silently skipped updating the bounding set and only updated the normal
-CAPNG_SELECT_CAPS capabilities instead.
-
-Check beforehand whether we have CAP_SETPCAP, in which case we can use
-CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set.
-Otherwise, we can at least update the normal capabilities, but refrain from
-trying to update the bounding set to avoid getting an error.
-
-Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
----
- mount.cifs.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index 4feb397..88b8b69 100644
---- mount.cifs.c
-+++ mount.cifs.c
-@@ -338,6 +338,8 @@ static int set_password(struct parsed_mount_info *parsed_info, const char *src)
- static int
- drop_capabilities(int parent)
- {
-+	capng_select_t set = CAPNG_SELECT_CAPS;
-+
- 	capng_setpid(getpid());
- 	capng_clear(CAPNG_SELECT_BOTH);
- 	if (parent) {
-@@ -355,7 +357,10 @@ drop_capabilities(int parent)
- 			return EX_SYSERR;
- 		}
- 	}
--	if (capng_apply(CAPNG_SELECT_BOTH)) {
-+	if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
-+		set = CAPNG_SELECT_BOTH;
-+	}
-+	if (capng_apply(set)) {
- 		fprintf(stderr, "Unable to apply new capability set.\n");
- 		return EX_SYSERR;
- 	}
--- 
-2.29.2
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 85af0443318..3acf8585ff4 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'cifs-utils'
 pkgname=cifs-utils
-version=6.11
-revision=3
+version=6.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
 make_install_args="ROOTSBINDIR=/usr/bin"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9
+checksum=922ddcc3059922e80789312c386b9c569991b4350d3ae3099de3e4b82f3885ef
 python_version=3
 
 pre_configure() {

From e7b6f4c568e4af8431ee7e6b9cbd3f411b30e53a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 5 Jan 2021 13:16:35 +0200
Subject: [PATCH 096/752] xfce4-screensaver: update to 4.16.0 and adopt.

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

diff --git a/srcpkgs/xfce4-screensaver/template b/srcpkgs/xfce4-screensaver/template
index 29449b56e50..3b41e3df905 100644
--- a/srcpkgs/xfce4-screensaver/template
+++ b/srcpkgs/xfce4-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-screensaver'
 pkgname=xfce4-screensaver
-version=0.1.11
+version=4.16.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-elogind --with-libgl --with-shadow --with-mit-ext
@@ -10,8 +10,8 @@ makedepends="gtk+3-devel libglib-devel libxklavier-devel libwnck-devel
  xfconf-devel garcon-devel libXScrnSaver-devel libXrandr-devel
  pam-devel elogind-devel"
 short_desc="Screensaver for XFCE4"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://git.xfce.org/apps/xfce4-screensaver"
 distfiles="https://archive.xfce.org/src/apps/xfce4-screensaver/${version%.*}/xfce4-screensaver-${version}.tar.bz2"
-checksum=814020da160ac4f9bcd79ae098ca6dd17643144214613dcb687821c8d8deac77
+checksum=6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d

From 2910827a0a4b7e42eb098a3f760c8b3ba14a1378 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 5 Jan 2021 13:24:23 +0200
Subject: [PATCH 097/752] mate-tweak: update to 21.04.1.

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

diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 68fd00a1519..4c67ab572af 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
-version=20.04.0
-revision=3
+version=21.04.1
+revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
 depends="mate-panel python3-gobject python3-psutil python3-setproctitle
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ubuntu-mate/mate-tweak"
 distfiles="https://github.com/ubuntu-mate/mate-tweak/archive/${version}.tar.gz"
-checksum=8c3537c0e649444d4ce587b562055e1c8e9ee28906ab688419cf8851e589b87d
+checksum=4ea3a181d15816358534105c7546eb8058702490af3e5c44482c38e212295361

From b51ba7628e4dc92555e84d3394853c97fa0fe5af Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 4 Jan 2021 22:25:57 +0200
Subject: [PATCH 098/752] skype: update to 8.67.0.96 and adopt.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 4f4b5d11b3f..188bd20d8e9 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,16 +1,16 @@
 # Template file for 'skype'
 # This just repackages the debian package.
 pkgname=skype
-version=8.66.0.74
+version=8.67.0.96
 revision=1
 archs="x86_64"
 depends="elogind"
 short_desc="Skype for Linux"
-maintainer="Lon Willett <xgit@lonw.net>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement"
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
-checksum=0ed958586e9bc99e2f91a3803314b059761eb21658f4dc85e945392347fe7785
+checksum=ea138f3241e27549b05173c638efdc029cf5e0030c534085872703263584b0c7
 repository="nonfree"
 nostrip="yes"
 

From 5cc22de0f71ce3a8a490c86c98fb97f3fcc77b7f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 1 Jan 2021 21:02:35 +0100
Subject: [PATCH 099/752] croc: update to 8.6.7.

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

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index ce656ce17d0..1844acf62e9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.6
+version=8.6.7
 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=fa1681180e884f0ed3d54c9a15dff90288b69663e485fd08fef38a063c83a7af
+checksum=4124fa4528d2cf3c63cf23e8598f976dfcd702858404cc69f4cd27245ebe0c33
 
 post_install() {
 	vlicense LICENSE

From c043c30867f7484dc6943a16dcbe24bea2deabfc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 5 Jan 2021 04:38:41 +0100
Subject: [PATCH 100/752] ghc: enable cross-compiling for -o bindist

this should make bringing up new platforms much easier since it
is now possible to cross-compile the initial bootstrap tarball
which can be used to compile a "proper" bootstrap tarball on
the target platform
---
 srcpkgs/ghc/template | 76 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 053814800d8..0b1440b2f6d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -5,9 +5,9 @@ version=8.8.4
 revision=2
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
-configure_args="--with-system-libffi"
-hostmakedepends="automake docbook-xsl ghc-bin libxslt python3-Sphinx"
-makedepends="gmp-devel libffi-devel libnuma-devel ncurses-devel"
+hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
+ ncurses-devel python3-Sphinx"
+makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -16,8 +16,8 @@ homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
 checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
 patch_args="-Np1"
-nocross=yes  # ask leah2 before wasting time trying to do that
-nodebug=yes  # Work around assembler error "Fatal error: duplicate .debug_line sections"
+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"
 nopie_files="
  ${_bindir}/ghc
@@ -36,13 +36,30 @@ nopie_files="
 build_options="bindist"
 desc_option_bindist="Create a binary distribution"
 
+# it is not possible to cross-compile an entire ghc distribution as
+# some components rely on stage2 binaries being runnable on the host
+# even cross-compiled bindists are incomplete, and you should only
+# use them to compile proper bindists on newly bootstrapped targets
+if [ -z "$build_option_bindist" ]; then
+	# final package builds use system libffi as well as gmp and ncurses
+	configure_args=" --with-system-libffi"
+	makedepends+=" libffi-devel ncurses-devel gmp-devel"
+elif [ -z "$CROSS_BUILD" ]; then
+	# native bindist builds use gmp and ncurses, but builtin libffi
+	makedepends+=" ncurses-devel gmp-devel"
+elif [ "${XBPS_MACHINE%-*}" != "${XBPS_TARGET_MACHINE%-*}" ]; then
+	# ghc's cross mode only works when the actual target arch differs
+	# i.e. cross-compiling to same arch but different libc does not work
+	unset nocross
+	# host must equal build and target must be set when cross-compiling
+	configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET}"
+fi
+
 # Recent safe to use tarball
 # GHC's bundled tarball is from 2017, buggy on some archs
 _ffi_rev=4d6d2866ae43e55325e8ee96561221804602cd7a
 
 if [ "$build_option_bindist" ]; then
-	# Strip --with-system-libffi from configuration
-	configure_args=${configure_args/--with-system-libffi/}
 	# Required to make the binary distribution tarball
 	hostmakedepends+=" tar xz libtool libltdl-devel"
 	# Fetch a safe libffi tarball
@@ -53,20 +70,43 @@ fi
 
 post_extract() {
 	[ "$build_option_bindist" ] || return 0
+
+	# update libffi for all bindists
 	rm -f libffi-tarballs/libffi-*.tar.gz
 	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/libffi-${_ffi_rev}.tar.gz \
 	 libffi-tarballs
+
+	[ "$CROSS_BUILD" ] || return 0
+
+	# create build config for cross bindists
+	local flav="quick"
+
+	echo "BuildFlavour = ${flav}" >> mk/build.mk
+	cat mk/flavours/${flav}.mk >> mk/build.mk
+
+	# gmp segfaults when cross-built
+	echo "INTEGER_LIBRARY = integer-simple" >> mk/build.mk
+	# otherwise needs ncurses for target
+	echo "WITH_TERMINFO = NO" >> mk/build.mk
+	# cannot be cross-compiled
+	echo "HADDOCK_DOCS = NO" >> mk/build.mk
+	# just wastes time
+	echo "BUILD_SPHINX_HTML = NO" >> mk/build.mk
+	echo "BUILD_SPHINX_PDF = NO" >> mk/build.mk
+	echo "BUILD_MAN = NO" >> mk/build.mk
 }
 
 pre_configure() {
+	# stage0 and stage1 are built for build/host (which are the
+	# same in ghc) and stage2 is built for target (when cross)
 	export CONF_CC_OPTS_STAGE0=$CFLAGS_FOR_BUILD
-	export CONF_CC_OPTS_STAGE1=$CFLAGS
+	export CONF_CC_OPTS_STAGE1=$CFLAGS_FOR_BUILD
 	export CONF_CC_OPTS_STAGE2=$CFLAGS
 	export CONF_GCC_LINKER_OPTS_STAGE0=$LDFLAGS_FOR_BUILD
-	export CONF_GCC_LINKER_OPTS_STAGE1=$LDFLAGS
+	export CONF_GCC_LINKER_OPTS_STAGE1=$LDFLAGS_FOR_BUILD
 	export CONF_GCC_LINKER_OPTS_STAGE2=$LDFLAGS
 	export CONF_CPP_OPTS_STAGE0=$CPPFLAGS_FOR_BUILD
-	export CONF_CPP_OPTS_STAGE1=$CPPFLAGS
+	export CONF_CPP_OPTS_STAGE1=$CPPFLAGS_FOR_BUILD
 	export CONF_CPP_OPTS_STAGE2=$CPPFLAGS
 
 	autoreconf -fi
@@ -76,11 +116,25 @@ post_install() {
 	sed -i 's#/usr/lib/ccache/bin/##g' ${DESTDIR}/usr/lib/ghc-${version%[!0-9]}/settings
 	vlicense LICENSE
 
+	local arch dest
+	if [ "$CROSS_BUILD" ]; then
+		arch=${XBPS_CROSS_TRIPLET%%-*}
+	else
+		arch=${XBPS_TRIPLET%%-*}
+	fi
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		dest=ghc-${version}-${arch}-void-linux-musl.tar.xz
+	else
+		dest=ghc-${version}-${arch}-void-linux.tar.xz
+	fi
+
 	if [ "$build_option_bindist" ]; then
 		msg_normal "Creating binary distribution for ${XBPS_TARGET_MACHINE}...\n"
 		make ${makejobs} binary-dist
 		mkdir -p ${XBPS_SRCDISTDIR}/distfiles
-		install -m 0644 ghc-${version}-*-linux.tar.xz ${XBPS_SRCDISTDIR}/distfiles
+		mv ghc-${version}-${arch}-unknown-linux.tar.xz ${dest}
+		install -m 0644 ${dest} ${XBPS_SRCDISTDIR}/distfiles
+		msg_normal "Installed in ${XBPS_SRCDISTDIR}/distfiles\n"
 		exit 1
 	fi
 }

From 4b320ac3efd7b0b82b53213985f01b923c21deec Mon Sep 17 00:00:00 2001
From: Anshul Sirur <anshul@3dhubs.com>
Date: Tue, 5 Jan 2021 15:53:45 +0100
Subject: [PATCH 101/752] aws-vault: update go_import_path

Go package name has changed to github.com/99designs/aws-vault/v6
---
 srcpkgs/aws-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index 3746480dad8..cdb99ac57ec 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,9 +1,9 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=6.2.0
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/99designs/aws-vault
+go_import_path=github.com/99designs/aws-vault/v6
 go_ldflags="-X \"main.Version=${version}\" -s -w"
 short_desc="Vault for securely storing and accessing AWS credentials"
 maintainer="klardotsh <josh@klar.sh>"

From d1e3e2d16314ec9beb79215951409fc8ea7b96c8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 16:44:20 +0100
Subject: [PATCH 102/752] libxls: update to 1.6.2.

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

diff --git a/srcpkgs/libxls/template b/srcpkgs/libxls/template
index cd195582a99..8d97afab784 100644
--- a/srcpkgs/libxls/template
+++ b/srcpkgs/libxls/template
@@ -1,6 +1,6 @@
 # Template file for 'libxls'
 pkgname=libxls
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=lib --enable-static"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/libxls/libxls"
 distfiles="https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"
-checksum=dbc35fbb7e83bb15adab21db6af8351b52485064e5b7e47685264cba4a99fcf8
+checksum=5dacc34d94bf2115926c80c6fb69e4e7bd2ed6403d51cff49041a94172f5e371
 
 post_install() {
 	sed '/^$/q' include/xls.h >LICENSE

From 754f8efd7602520fd0ec45e103687d6944866de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 4 Jan 2021 23:36:59 +0100
Subject: [PATCH 103/752] nvidia390: add patches for linux5.9

---
 .../nvidia390/files/linux-5.9.x-x86_64.patch  |  58 +++
 srcpkgs/nvidia390/files/linux-5.9.x.patch     | 427 ++++++++++++++++++
 srcpkgs/nvidia390/template                    |   6 +-
 3 files changed, 490 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
 create mode 100644 srcpkgs/nvidia390/files/linux-5.9.x.patch

diff --git a/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch b/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
new file mode 100644
index 00000000000..bc55a467f9a
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
@@ -0,0 +1,58 @@
+Source: Mageia, http://sophie.zarb.org/rpms/eaff282f82f9fc9911151ebd234f25cc/files/7
+diff --git a/kernel/nvidia-uvm/nvidia-uvm.Kbuild b/kernel/nvidia-uvm/nvidia-uvm.Kbuild
+index 650c922..0c83fae 100644
+--- a/kernel/nvidia-uvm/nvidia-uvm.Kbuild
++++ b/kernel/nvidia-uvm/nvidia-uvm.Kbuild
+@@ -108,10 +108,11 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += bitmap_clear
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += usleep_range
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += radix_tree_empty
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += radix_tree_replace_slot
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += do_gettimeofday
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += ktime_get_raw_ts64
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += smp_read_barrier_depends
+ 
+ NV_CONFTEST_TYPE_COMPILE_TESTS += proc_dir_entry
+ NV_CONFTEST_TYPE_COMPILE_TESTS += irq_handler_t
+ NV_CONFTEST_TYPE_COMPILE_TESTS += outer_flush_all
+ NV_CONFTEST_TYPE_COMPILE_TESTS += vm_operations_struct
+diff --git a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
+index 86dbb77..be865bc 100644
+--- a/kernel/nvidia-uvm/uvm8_tools.c
++++ b/kernel/nvidia-uvm/uvm8_tools.c
+@@ -188,11 +188,15 @@ static NV_STATUS tools_update_status(uvm_va_space_t *va_space);
+ 
+ static uvm_tools_event_tracker_t *tools_event_tracker(struct file *filp)
+ {
+     long event_tracker = atomic_long_read((atomic_long_t *)&filp->private_data);
+ 
++#if defined(NV_SMP_READ_BARRIER_DEPENDS_PRESENT)
+     smp_read_barrier_depends();
++#else
++    smp_rmb();
++#endif
+     return (uvm_tools_event_tracker_t *)event_tracker;
+ }
+ 
+ static bool tracker_is_queue(uvm_tools_event_tracker_t *event_tracker)
+ {
+diff --git a/kernel/nvidia-uvm/uvm8_va_range.h b/kernel/nvidia-uvm/uvm8_va_range.h
+index 8cae357..a74ad24 100644
+--- a/kernel/nvidia-uvm/uvm8_va_range.h
++++ b/kernel/nvidia-uvm/uvm8_va_range.h
+@@ -715,11 +715,15 @@ static uvm_va_block_t *uvm_va_range_block(uvm_va_range_t *va_range, size_t index
+     // Later accesses in this thread will read state out of block, potentially
+     // as soon as the block pointer is updated by another thread. We have to
+     // make sure that any initialization of this block by the creating thread is
+     // visible to later accesses in this thread, which requires a data
+     // dependency barrier.
++#if defined(NV_SMP_READ_BARRIER_DEPENDS_PRESENT)
+     smp_read_barrier_depends();
++#else
++    smp_mb();
++#endif
+     return block;
+ }
+ 
+ // Same as uvm_va_range_block except that the block is created if not already
+ // present in the array. If NV_OK is returned, the block has been allocated
+
diff --git a/srcpkgs/nvidia390/files/linux-5.9.x.patch b/srcpkgs/nvidia390/files/linux-5.9.x.patch
new file mode 100644
index 00000000000..763ee4e5c08
--- /dev/null
+++ b/srcpkgs/nvidia390/files/linux-5.9.x.patch
@@ -0,0 +1,427 @@
+Source: Mageia, http://sophie.zarb.org/rpms/eaff282f82f9fc9911151ebd234f25cc/files/8
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 37c6841..23efe9e 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -159,12 +159,14 @@ static inline uid_t __kuid_val(kuid_t uid)
+ }
+ #endif
+ 
+ #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
+ #include <linux/syscalls.h>         /* sys_ioctl()                      */
++#if defined(NV_LINUX_IOCTL32_H_PRESENT)
+ #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
+ #endif
++#endif
+ 
+ #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
+   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
+ #error "struct file_operations compile test likely failed!"
+ #endif
+diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
+index 8df26f1..e791bb2 100644
+--- a/kernel/common/inc/nv-mm.h
++++ b/kernel/common/inc/nv-mm.h
+@@ -146,10 +146,15 @@ typedef int vm_fault_t;
+         #if defined(NV_GET_USER_PAGES_REMOTE_HAS_LOCKED_ARG)
+ 
+                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+                                             pages, vmas, NULL);
+ 
++        #elif defined(NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG)
++
++               return get_user_pages_remote(mm, start, nr_pages, flags,
++                                            pages, vmas, NULL);
++
+         #else
+ 
+                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+                                             pages, vmas);
+ 
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index cdb249c..54da233 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -132,10 +132,11 @@ test_headers() {
+     FILES="$FILES linux/sched/task_stack.h"
+     FILES="$FILES xen/ioemu.h"
+     FILES="$FILES linux/fence.h"
+     FILES="$FILES linux/ktime.h"
+     FILES="$FILES linux/dma-resv.h"
++    FILES="$FILES linux/ioctl32.h"
+ 
+     # Arch specific headers which need testing
+     FILES_ARCH="asm/book3s/64/hash-64k.h"
+     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
+     FILES_ARCH="$FILES_ARCH asm/powernv.h"
+@@ -2449,10 +2450,69 @@ compile_test() {
+             }"
+ 
+             compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_LEGACY_DEV_LIST" "" "types"
+         ;;
+ 
++        drm_driver_has_gem_free_object)
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++
++            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
++            #include <drm/drm_drv.h>
++            #endif
++
++            int conftest_drm_driver_has_gem_free_object(void) {
++                return offsetof(struct drm_driver, gem_free_object);
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT" "" "types"
++        ;;
++
++        drm_display_mode_has_vrefresh)
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++
++            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
++            #include <drm/drm_drv.h>
++            #endif
++
++            int conftest_drm_display_mode_has_vrefresh(void) {
++                return offsetof(struct drm_display_mode, vrefresh);
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_DISPLAY_MODE_HAS_VREFRESH" "" "types"
++        ;;
++
++        drm_master_set_returns_int)
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++
++            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
++            #include <drm/drm_drv.h>
++            #endif
++
++            static int nv_master_set(struct drm_device *x, struct drm_file *y, bool z)
++            {
++                return 1;
++            }
++
++            int conftest_drm_master_set_returns_int(void) {
++                struct drm_driver nv_drm_driver;
++                nv_drm_driver.master_set = nv_master_set;
++
++                return nv_drm_driver.master_set(NULL, NULL, false);
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_MASTER_SET_RETURNS_INT" "" "generic"
++        ;;
++
+         jiffies_to_timespec)
+             #
+             # Determine if jiffies_to_timespec() is present
+             #
+             # removed by commit 751addac78b6
+@@ -3138,10 +3198,33 @@ compile_test() {
+             else
+                 echo "#undef NV_GET_USER_PAGES_REMOTE_HAS_LOCKED_ARG" | append_conftest "functions"
+             fi
+             echo "#undef NV_GET_USER_PAGES_REMOTE_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
+ 
++            # conftest #4: check if get_user_pages_remote() has removed tsk argument
++
++            echo "$CONFTEST_PREAMBLE
++            #include <linux/mm.h>
++            long get_user_pages_remote(struct mm_struct *mm,
++                                       unsigned long start,
++                                       unsigned long nr_pages,
++                                       unsigned int gup_flags,
++                                       struct page **pages,
++                                       struct vm_area_struct **vmas,
++                                       int *locked) {
++                return 0;
++            }" > conftest$$.c
++
++            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++            rm -f conftest$$.c
++
++            if [ -f conftest$$.o ]; then
++                echo "#define NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG" | append_conftest "functions"
++                rm -f conftest$$.o
++            else
++                echo "#undef NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG" | append_conftest "functions"
++            fi
+         ;;
+ 
+         usleep_range)
+             #
+             # Determine if the function usleep_range() is present.
+@@ -3227,10 +3310,25 @@ compile_test() {
+                 echo "#undef NV_DRM_GEM_OBJECT_LOOKUP_PRESENT" | append_conftest "functions"
+                 echo "#undef NV_DRM_GEM_OBJECT_LOOKUP_ARGUMENT_COUNT" | append_conftest "functions"
+             fi
+         ;;
+ 
++        drm_gem_object_put_unlocked)
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++            #if defined(NV_DRM_DRM_GEM_H_PRESENT)
++            #include <drm/drm_gem.h>
++            #endif
++            int conftest_drm_gem_object_put_unlocked(void) {
++                drm_gem_object_put_unlocked();
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT" "" "functions"
++        ;;
++
+         drm_master_drop_has_from_release_arg)
+             #
+             # Determine if drm_driver::master_drop() has 'from_release' argument.
+             #
+             # Last argument 'bool from_release' has been removed by:
+@@ -4129,10 +4227,30 @@ compile_test() {
+             }"
+ 
+             compile_check_conftest "$CODE" "NV_PCI_DEV_HAS_SKIP_BUS_PM" "" "types"
+         ;;
+ 
++        smp_read_barrier_depends)
++            CODE="
++            #include <asm/barrier.h>
++            void conftest_smp_read_barrier_depends(void) {
++                smp_read_barrier_depends(0);
++            }"
++
++            compile_check_conftest "$CODE" "NV_SMP_READ_BARRIER_DEPENDS_PRESENT" "" "functions"
++        ;;
++
++        vga_tryget)
++            CODE="
++            #include <linux/vgaarb.h>
++            void conftest_vga_tryget(void) {
++                vga_tryget();
++            }"
++
++            compile_check_conftest "$CODE" "NV_VGA_TRYGET_PRESENT" "" "functions"
++        ;;
++
+     esac
+ }
+ 
+ case "$6" in
+     cc_sanity_check)
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index 17e377d..95e035b 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -464,20 +464,29 @@ static void nv_drm_unload(struct drm_device *dev)
+ }
+ #endif
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ 
++#if defined(NV_DRM_MASTER_SET_RETURNS_INT)
+ static int nv_drm_master_set(struct drm_device *dev,
+                              struct drm_file *file_priv, bool from_open)
++#else
++static void nv_drm_master_set(struct drm_device *dev,
++                              struct drm_file *file_priv, bool from_open)
++#endif
+ {
+     struct nv_drm_device *nv_dev = to_nv_device(dev);
+ 
++#if defined(NV_DRM_MASTER_SET_RETURNS_INT)
+     if (!nvKms->grabOwnership(nv_dev->pDevice)) {
+         return -EINVAL;
+     }
+ 
+     return 0;
++#else
++    nvKms->grabOwnership(nv_dev->pDevice);
++#endif
+ }
+ 
+ #if defined(NV_DRM_MASTER_DROP_HAS_FROM_RELEASE_ARG)
+ static
+ void nv_drm_master_drop(struct drm_device *dev,
+@@ -675,11 +684,15 @@ static struct drm_driver nv_drm_driver = {
+ #if defined(NV_DRM_DRIVER_PRIME_FLAG_PRESENT)
+                                DRIVER_PRIME |
+ #endif
+                                DRIVER_GEM  | DRIVER_RENDER,
+ 
++#if defined(NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT)
+     .gem_free_object        = nv_drm_gem_free,
++#else
++    .gem_free_object_unlocked = nv_drm_gem_free,
++#endif
+ 
+     .ioctls                 = nv_drm_ioctls,
+     .num_ioctls             = ARRAY_SIZE(nv_drm_ioctls),
+ 
+     .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
+index 37100ed..eb7b959 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem.c
+@@ -41,11 +41,13 @@
+ void nv_drm_gem_free(struct drm_gem_object *gem)
+ {
+     struct drm_device *dev = gem->dev;
+     struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
+ 
++#if !defined(NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT)
+     WARN_ON(!mutex_is_locked(&dev->struct_mutex));
++#endif
+ 
+     /* Cleanup core gem object */
+ 
+     drm_gem_object_release(&nv_gem->base);
+ 
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
+index 5691a7a..7fc6f69 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -85,11 +85,15 @@ static inline struct nv_drm_gem_object *to_nv_gem_object(
+ 
+ static inline void
+ nv_drm_gem_object_unreference_unlocked(struct nv_drm_gem_object *nv_gem)
+ {
+ #if defined(NV_DRM_GEM_OBJECT_GET_PRESENT)
++#if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
+     drm_gem_object_put_unlocked(&nv_gem->base);
++#else
++    drm_gem_object_put(&nv_gem->base);
++#endif
+ #else
+     drm_gem_object_unreference_unlocked(&nv_gem->base);
+ #endif
+ }
+ 
+@@ -136,11 +140,10 @@ void nv_drm_gem_object_init(struct nv_drm_device *nv_dev,
+     nv_dma_resv_init(&nv_gem->resv);
+ 
+ #if defined(NV_DRM_GEM_OBJECT_HAS_RESV)
+     nv_gem->base.resv = &nv_gem->resv;
+ #endif
+-
+ #endif
+ 
+     drm_gem_private_object_init(dev, &nv_gem->base, size);
+ }
+ 
+diff --git a/kernel/nvidia-drm/nvidia-drm-utils.c b/kernel/nvidia-drm/nvidia-drm-utils.c
+index 8cb2d5e..6460d4d 100644
+--- a/kernel/nvidia-drm/nvidia-drm-utils.c
++++ b/kernel/nvidia-drm/nvidia-drm-utils.c
+@@ -101,11 +101,13 @@ int nvkms_connector_type_to_drm_connector_type(NvKmsConnectorType type,
+ 
+ void
+ nvkms_display_mode_to_drm_mode(const struct NvKmsKapiDisplayMode *displayMode,
+                                struct drm_display_mode *mode)
+ {
++#if defined(NV_DRM_DISPLAY_MODE_HAS_VREFRESH)
+     mode->vrefresh    = (displayMode->timings.refreshRate + 500) / 1000; /* In Hz */
++#endif
+ 
+     mode->clock       = (displayMode->timings.pixelClockHz + 500) / 1000; /* In Hz */
+ 
+     mode->hdisplay    = displayMode->timings.hVisible;
+     mode->hsync_start = displayMode->timings.hSyncStart;
+@@ -187,11 +189,13 @@ bool drm_format_to_nvkms_format(u32 format,
+ }
+ 
+ void drm_mode_to_nvkms_display_mode(const struct drm_display_mode *src,
+                                     struct NvKmsKapiDisplayMode *dst)
+ {
++#if defined(NV_DRM_DISPLAY_MODE_HAS_VREFRESH)
+     dst->timings.refreshRate  = src->vrefresh * 1000;
++#endif
+ 
+     dst->timings.pixelClockHz = src->clock * 1000; /* In Hz */
+ 
+     dst->timings.hVisible   = src->hdisplay;
+     dst->timings.hSyncStart = src->hsync_start;
+diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
+index 4cfbbbc..d9dbab8 100644
+--- a/kernel/nvidia-drm/nvidia-drm.Kbuild
++++ b/kernel/nvidia-drm/nvidia-drm.Kbuild
+@@ -47,18 +47,20 @@ $(call ASSIGN_PER_OBJ_CFLAGS, $(NVIDIA_DRM_OBJECTS), $(NVIDIA_DRM_CFLAGS))
+ 
+ NV_OBJECTS_DEPEND_ON_CONFTEST += $(NVIDIA_DRM_OBJECTS)
+ 
+ NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_available
+ NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_atomic_available
++NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_master_set_returns_int
+ NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_inc
+ NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_dec_and_test
+ 
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_dev_unref
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_reinit_primary_mode_group
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages_remote
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_lookup
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_atomic_state_ref_counting
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_driver_has_gem_prime_res_obj
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_atomic_helper_connector_dpms
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_funcs_have_mode_in_name
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += vmf_insert_pfn
+@@ -70,10 +72,12 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_for_each_possible_encoder
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_present
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_bus_type
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_get_irq
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_get_name
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_legacy_dev_list
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_gem_free_object
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_display_mode_has_vrefresh
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_set_busid
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_state_has_connectors_changed
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_init_function_args
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_connector_list_update_has_merge_type_bits_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_helper_mode_fill_fb_struct
+diff --git a/kernel/nvidia-modeset/nvidia-modeset-linux.c b/kernel/nvidia-modeset/nvidia-modeset-linux.c
+index f7f1def..8fb2161 100644
+--- a/kernel/nvidia-modeset/nvidia-modeset-linux.c
++++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c
+@@ -49,12 +49,14 @@
+ #endif
+ 
+ 
+ #if NV_NEEDS_COMPAT_IOCTL_REGISTRATION
+ #include <linux/syscalls.h> /* sys_ioctl() */
++#if defined(NV_LINUX_IOCTL32_H_PRESENT)
+ #include <linux/ioctl32.h> /* register_ioctl32_conversion() */
+ #endif
++#endif
+ 
+ #define NVKMS_MAJOR_DEVICE_NUMBER 195
+ #define NVKMS_MINOR_DEVICE_NUMBER 254
+ 
+ #define NVKMS_LOG_PREFIX "nvidia-modeset: "
+diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
+index 15983f6..a7be80a 100644
+--- a/kernel/nvidia/nv.c
++++ b/kernel/nvidia/nv.c
+@@ -3870,11 +3870,15 @@ nvidia_probe
+ 
+     pci_set_master(dev);
+ 
+ #if defined(CONFIG_VGA_ARB) && !defined(NVCPU_PPC64LE)
+ #if defined(VGA_DEFAULT_DEVICE)
++#if defined(NV_VGA_TRYGET_PRESENT)
+     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
++#else
++    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
++#endif
+ #endif
+     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
+ #endif
+ 
+     if (rm_get_cpu_type(sp, &nv_cpu_type) != NV_OK)
+
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 4fb6ff6ec88..21ea5c04747 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.138
-revision=2
+revision=3
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -43,6 +43,10 @@ pre_install() {
 	cp nvidia_icd.json.template nvidia_icd.json
 	sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json
 	patch -Np1 < ${FILESDIR}/linux-5.8.x.patch
+	patch -Np1 < ${FILESDIR}/linux-5.9.x.patch
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		patch -Np1 < ${FILESDIR}/linux-5.9.x-x86_64.patch
+	fi
 }
 
 do_install() {

From 0d63f7e510a5af6981bb2afe0f16af58995d17c3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 4 Jan 2021 15:42:36 -0600
Subject: [PATCH 104/752] nodejs: update to 14.15.4.

---
 srcpkgs/nodejs/patches/python3.9.patch | 35 --------------------------
 srcpkgs/nodejs/template                |  4 +--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/nodejs/patches/python3.9.patch

diff --git a/srcpkgs/nodejs/patches/python3.9.patch b/srcpkgs/nodejs/patches/python3.9.patch
deleted file mode 100644
index c6902083209..00000000000
--- a/srcpkgs/nodejs/patches/python3.9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c8b950a7afcc3e7c222bb94fabccc7e2fb447457 Mon Sep 17 00:00:00 2001
-From: cclauss <cclauss@me.com>
-Date: Tue, 6 Oct 2020 17:51:24 +0200
-Subject: [PATCH] build: gitHub actions: Python 3.9 and actions/setup-python@v2
-
-PR-URL: https://github.com/nodejs/node/pull/35521
-Reviewed-By: Richard Lau <rlau@redhat.com>
-Reviewed-By: Shelley Vohr <codebytere@gmail.com>
-Reviewed-By: Rich Trott <rtrott@gmail.com>
-Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
-Reviewed-By: Myles Borins <myles.borins@gmail.com>
-
-Modified by fosslinux to remove .github stuff.
-
-diff --git configure configure
-index 7e8c4cff832..07581d9c5a4 100755
---- configure
-+++ configure
-@@ -5,6 +5,7 @@
- # as is the fact that the ] goes on a new line.
- _=[ 'exec' '/bin/sh' '-c' '''
- test ${FORCE_PYTHON2} && exec python2 "$0" "$@"  # workaround for gclient
-+command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
- command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
- command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
- command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
-@@ -19,7 +20,7 @@ import sys
- from distutils.spawn import find_executable
- 
- print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
--acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
-+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
- if sys.version_info[:2] in acceptable_pythons:
-   import configure
- else:
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 91f2889fd52..7f305afc202 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=14.13.1
+version=14.15.4
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=f0080d3284ea1585e255a3f459ce151e8106a33f4ce8bed0da15ff99c6a082a5
+checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 2ef1ce5f75ec29a224d9e1e1715ed9b2e976bae3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 4 Jan 2021 16:05:24 -0600
Subject: [PATCH 105/752] nodejs-lts: update to 12.20.1.

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

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 9e4abb76a62..7cf73720977 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.18.4
+version=12.20.1
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=a802d87e579e46fc52771ed6f2667048320caca867be3276f4c4f1bbb41389c3
+checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 8ffaf2c86d32416ab034bb9ed08c433bea240759 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 4 Jan 2021 16:39:59 -0600
Subject: [PATCH 106/752] nodejs-lts-10: update to 10.23.1.

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

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 7ec04528233..773b0dcf1a0 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs-lts-10'
 pkgname=nodejs-lts-10
-version=10.23.0
+version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
@@ -16,7 +16,7 @@ maintainer="k4leg <d0xi@inbox.ru>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=fd356039d5c223f020db514b64e4619b285e669f8f5f0b6232458d4440c6741f
+checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 9f2617e7ec2ddc046716b866c1433b875fcca461 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Tue, 5 Jan 2021 12:12:46 -0600
Subject: [PATCH 107/752] bpytop: update to 1.0.56.

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

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index 9ad798fe4fc..99110c02729 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.52
+version=1.0.56
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=15ef1bd094d945b9145343566c2596bb34922870e6be56c3cc028b33aff056fa
+checksum=ea1cdc292174cd05fbb17f237a99f8357304c67dfe873297223316c8ca981b7a
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From fd40b0e48deb2277d12f69057ccaa2631fac5bc5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 5 Jan 2021 12:06:41 -0600
Subject: [PATCH 108/752] delta: update to 0.5.0.

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

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

From 2d07e005eb5ce67f9fc5bf7d73d662583315a7a8 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 13 Mar 2019 00:23:58 +0100
Subject: [PATCH 109/752] New package: removed-packages

this meta-package replaces all packages which should be removed
---
 srcpkgs/removed-packages/template | 83 +++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 srcpkgs/removed-packages/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
new file mode 100644
index 00000000000..bc175313071
--- /dev/null
+++ b/srcpkgs/removed-packages/template
@@ -0,0 +1,83 @@
+# Template file for 'removed-packages'
+pkgname=removed-packages
+version=0.1
+revision=1
+build_style=meta
+short_desc="Uninstalls packages removed from repository"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="Public Domain"
+homepage="https://voidlinux.org"
+
+replaces="
+ Platinum9-theme<=0.0.0.20170720_3
+ apg<=2.2.3_5
+ arm-mem-git<=20131108_2
+ arptables<=0.0.4_3
+ bokken<=1.8_3
+ caja-gksu<=1.20.2_2
+ california<=0.4.0_4
+ ctpp2<=2.8.3_7
+ ctpp2-devel<=2.8.3_7
+ dleyna-core<=0.6.0_2
+ dleyna-renderer<=0.6.0_2
+ dleyna-server<=0.6.0_2
+ ebtables<=2.0.10.4_8
+ eclipse-ecj<=4.9_3
+ enventor<=1.0.0_2
+ epstopdf<=2.27_3
+ fontmatrix<=0.6.0.20171228_2
+ gksu<=2.0.2_4
+ go1.4-bootstrap<=20171003_2
+ goffice0.8<=0.8.17_6
+ grv<=0.3.1_3
+ httperf<=0.9.0_9
+ isl16<=0.16_2
+ keepassx<=0.4.4_2
+ libapp<=20140527_2
+ libdbusmenu-qt<=0.9.2_4
+ libgksu<=2.0.12_5
+ libqzeitgeist<=0.8.0_6
+ libump-git<=20150407_2
+ livewallpaper<=0.5.0_2
+ llvm3.9<=3.9.1_5
+ lmdb++<=0.9.14.0+20160229_2
+ ls++-git<=20140919_3
+ mac<=3.99u4b5s7_3
+ mdds0<=0.12.1_3
+ mongroup<=0.4.1_2
+ mtxclient<=0.2.0_3
+ nheko<=0.6.2_2
+ oksh<=0.5.9_3
+ oxygen-icons<=4.14.3_3
+ phonon-backend-gstreamer<=4.9.0_2
+ phonon-backend-vlc<=0.9.1_3
+ polkit-qt<=0.112.0_5
+ profile-sync-daemon<=5.75_4
+ profont<=1.0_2
+ puddletag<=1.2.0_3
+ pyside-tools<=0.2.15_2
+ python-PyQt4<=4.12.1_4
+ python-SecretStorage<=2.3.1_4
+ python-audit<=2.8.5_2
+ python-jellyfish<=0.6.1_2
+ python-pivy<=0.6.4_2
+ python-pyenet<=1.3.13.post7_2
+ python-pyside<=1.2.2_7
+ python-pytest-relaxed<=1.1.2_2
+ qimageblitz<=0.0.6_4
+ r2-bindings<=1.0.1_2
+ seriespl<=2.3.5_2
+ simple-obfs<=0.0.5_2
+ skypetab-ng<=20150201_3
+ soulseekqt<=20160117_2
+ spacefm-ng<=1.0.6_3
+ timidity<=2.15.0_1
+ ttyload-git<=20141117_4
+ tweeny<=2_2
+ urlmatch-git<=20141116_2
+ v8<=3.24.35.33_4
+ varnish<=6.1.1_3
+ wireguard-go<=0.0.20181222_2
+ wireshark-gtk<=3.0.7_1
+ yt-play<=20140117_2
+"

From 9a1b3bbbf8b2b31a8f744ce3c815b959225f93eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Dec 2019 21:30:28 +0100
Subject: [PATCH 110/752] Manual.md: add package to removed-packages on removal

---
 Manual.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index 4f954b840be..386daa24362 100644
--- a/Manual.md
+++ b/Manual.md
@@ -929,7 +929,7 @@ can be used to pass arguments during compilation. If your package does not make
 extensions consider using the `gem` build style instead.
 
 - `gem` For packages that are installed using gems from [RubyGems](https://rubygems.org/).
-The gem command can be overridden by `gem_cmd`. 
+The gem command can be overridden by `gem_cmd`.
 `distfiles` is set by the build style if the template does not do so. If your gem
 provides extensions which must be compiled consider using the `gemspec` build style instead.
 
@@ -1652,6 +1652,9 @@ generally those packages are the same but have been split as to avoid
 cyclic dependencies. Make sure that the package you're removing is not
 the source of those patches/files.
 - Remove package template.
+- Add `pkgname<=version_revision` to `replaces` variable of `removed-packages`
+template.  All removed subpkgs should be added too.
+This will uninstall package from systems where it is installed.
 - Remove the package from the repository index
 or contact a team member that can do so.
 

From 334811238972846da68d0b26cd505c73427888b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Dec 2019 21:28:54 +0100
Subject: [PATCH 111/752] base-system: depend on removed-packages

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

diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index 810563c1bad..cf398262205 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -1,7 +1,7 @@
 # Template file for 'base-system'
 pkgname=base-system
-version=0.113
-revision=2
+version=0.114
+revision=1
 build_style=meta
 short_desc="Void Linux base system meta package"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ depends="
  mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools
  procps-ng tzdata pciutils usbutils iana-etc openssh dhcpcd
  kbd iproute2 iputils iw wpa_supplicant xbps nvi sudo wifi-firmware
- void-artwork traceroute ethtool kmod acpid eudev runit-void"
+ void-artwork traceroute ethtool kmod acpid eudev runit-void removed-packages"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;

From 5d35e5a1d15441f7ce9cd770af342be41744ad72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 5 Jan 2021 18:24:26 +0100
Subject: [PATCH 112/752] base-minimal: depend on removed-packages

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

diff --git a/srcpkgs/base-minimal/template b/srcpkgs/base-minimal/template
index 95021043f7b..f43f0c3ccc3 100644
--- a/srcpkgs/base-minimal/template
+++ b/srcpkgs/base-minimal/template
@@ -1,6 +1,6 @@
 # Template file for 'base-minimal'
 pkgname=base-minimal
-version=0.2
+version=0.3
 revision=1
 build_style=meta
 short_desc="Void Linux base system meta with minimal tools"
@@ -11,7 +11,7 @@ homepage="https://www.voidlinux.org/"
 depends="
  base-files coreutils findutils diffutils dash grep gzip sed gawk
  util-linux which tar shadow procps-ng iana-etc xbps nvi tzdata
- runit-void"
+ runit-void removed-packages"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;

From 1b4bf7ce7c6ffb9a1a03a206197633e85ee2a840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 5 Jan 2021 18:45:02 +0100
Subject: [PATCH 113/752] base-voidstrap: depend on removed-packages

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

diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template
index 763ced9a306..563f950d5d7 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-voidstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'base-voidstrap'
 pkgname=base-voidstrap
-version=0.10
+version=0.11
 revision=1
 build_style=meta
 short_desc="Void Linux base system meta package for containers/chroots"
@@ -13,7 +13,7 @@ depends="
  dash bash grep gzip file sed gawk less util-linux which tar man-pages
  mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd
  procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd
- iproute2 iputils iw xbps nvi sudo traceroute kmod"
+ iproute2 iputils iw xbps nvi sudo traceroute kmod removed-packages"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;

From 589b871f7608e32b1c5d4643859a82243275bcd4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 5 Jan 2021 19:12:15 +0100
Subject: [PATCH 114/752] libfilezilla: update to 0.26.0.

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

diff --git a/common/shlibs b/common/shlibs
index d9319f0c221..aa697549809 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2570,7 +2570,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.10 libfilezilla-0.25.0_1
+libfilezilla.so.11 libfilezilla-0.26.0_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 edac101ac1a..3a3d090ca6e 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.25.0
+version=0.26.0
 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=3bf6feb5246ed3d11b72d74b485d1989724be0884568cd456195e7624f9c7b2a
+checksum=17ed226593e8e466ce3c3f8ce583b36c79f163189ead54d631613cc3da5c80bd
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 6dafa4d70ffc1e6eee4e2e7a2cd28ffa22f1c0cf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 5 Jan 2021 19:50:06 +0100
Subject: [PATCH 115/752] filezilla: update to 3.52.0.1.

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

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9d32be643b8..56decc86a42 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.51.0
+version=3.52.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=82be1c4a4f51bb32a599d0b4cc3a24127ba948c0af0f957233cc6a13ea3b6c4c
+checksum=45ac7aba6600d04b4fb38d3769e99fd615d4eccb9233403c3454cafcef656570
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d20edd5adae84428b5f818629084789a4fb44449 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 5 Jan 2021 12:48:27 +0100
Subject: [PATCH 116/752] portage: update to 3.0.12.

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

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 8d79f315737..3f44cd3d6c3 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.11
+version=3.0.12
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=0926f5be40428fe13100ef130ad12c9162ba455580d27640f161fb5f41a3abcf
+checksum=4f8f4e1547d903f020eedceab6119a640ff2b331da33dc5e07b1634a63859d59
 
 conf_files="
 	/etc/dispatch-conf.conf

From d9d0f7ad9a9105478bec3ff24072461cd37b0dee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 19:45:58 +0100
Subject: [PATCH 117/752] kernel-libc-headers: update to 5.10.4.

---
 .../1-5-kernel-libc-compat-musl-support.patch | 117 ------------------
 .../patches/1-6-musl-libc-net-compat.patch    | 109 ----------------
 .../patches/1-7-musl-aarch64-asm-ptrace.patch |  28 -----
 .../patches/1-8-if_tunnel.h.patch             |  14 +++
 srcpkgs/kernel-libc-headers/template          |  26 ++--
 5 files changed, 27 insertions(+), 267 deletions(-)
 delete mode 100644 srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch
 delete mode 100644 srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch
 delete mode 100644 srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch
 create mode 100644 srcpkgs/kernel-libc-headers/patches/1-8-if_tunnel.h.patch

diff --git a/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch b/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch
deleted file mode 100644
index 99ab5f791a6..00000000000
--- a/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Source: yopito
-Upstream: No
-Reason: musl compatibility
---- include/uapi/linux/libc-compat.h	2018-11-01 21:44:22.016378667 +0100
-+++ include/uapi/linux/libc-compat.h	2018-11-01 21:54:14.382052324 +0100
-@@ -170,11 +170,102 @@
- #define __UAPI_DEF_XATTR		1
- #endif
- 
-+/*
-+ * Support of guessed LIBC musl, since neither glibc nor kernel space.
-+ * Written for musl libc 1.1.16. Mimics the glibc support above.
-+ */
-+#elif !defined(__KERNEL__) /* and not __GLIBC__ */
-+
-+/* Coordinate with musl libc net/if.h header. */
-+#if defined(_NET_IF_H)
-+
-+/* LIBC headers included first so don't define anything
-+ * that would already be defined. */
-+
-+#define __UAPI_DEF_IF_IFCONF		0
-+#define __UAPI_DEF_IF_IFMAP		0
-+#define __UAPI_DEF_IF_IFNAMSIZ		0
-+#define __UAPI_DEF_IF_IFREQ		0
-+
-+/* Everything up to IFF_DYNAMIC, matches net/if.h */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS	0
-+
-+/* musl libc defines IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
-+
-+#else /* _NET_IF_H */
-+
-+/* Linux headers included first, and we must define everything
-+ * we need. Will define the corresponding structures twice
-+ * if net/if.h is included later ?  */
-+
-+#define __UAPI_DEF_IF_IFCONF		1
-+#define __UAPI_DEF_IF_IFMAP		1
-+#define __UAPI_DEF_IF_IFNAMSIZ		1
-+#define __UAPI_DEF_IF_IFREQ		1
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS	1
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-+
-+#endif /* _NET_IF_H */
-+
-+/* Coordinate with musl libc netinet/in.h header. */
-+#if defined(_NETINET_IN_H)
-+
-+/* musl 1.1.16 LIBC netinet/in.h defines the following (to 0),
-+ * so it's useless to set them again:
-+ *   __UAPI_DEF_IN_ADDR        __UAPI_DEF_IN_IPPROTO
-+ *   __UAPI_DEF_IN_PKTINFO     __UAPI_DEF_IP_MREQ
-+ *   __UAPI_DEF_SOCKADDR_IN    __UAPI_DEF_IN_CLASS
-+ *   __UAPI_DEF_IN6_ADDR       __UAPI_DEF_IN6_ADDR_ALT
-+ *   __UAPI_DEF_SOCKADDR_IN6   __UAPI_DEF_IPV6_MREQ
-+ *   __UAPI_DEF_IPPROTO_V6     __UAPI_DEF_IPV6_OPTIONS
-+ *   __UAPI_DEF_IN6_PKTINFO    __UAPI_DEF_IP6_MTUINFO
-+ */
-+
-+#else /* _NETINET_IN_H */
-+
-+/* Linux headers included first, and we must define everything
-+ * we need. Will define the corresponding structures twice
-+ * if netinet/in.h is included later ? */
-+
-+#define __UAPI_DEF_IN_ADDR		1
-+#define __UAPI_DEF_IN_IPPROTO		1
-+#define __UAPI_DEF_IN_PKTINFO		1
-+#define __UAPI_DEF_IP_MREQ		1
-+#define __UAPI_DEF_SOCKADDR_IN		1
-+#define __UAPI_DEF_IN_CLASS		1
-+
-+#define __UAPI_DEF_IN6_ADDR		1
-+#define __UAPI_DEF_IN6_ADDR_ALT		1
-+#define __UAPI_DEF_SOCKADDR_IN6		1
-+#define __UAPI_DEF_IPV6_MREQ		1
-+#define __UAPI_DEF_IPPROTO_V6		1
-+#define __UAPI_DEF_IPV6_OPTIONS		1
-+#define __UAPI_DEF_IN6_PKTINFO		1
-+#define __UAPI_DEF_IP6_MTUINFO		1
-+
-+#endif /* _NETINET_IN_H */
-+
-+/* musl libc does not provide IPX support */
-+#define __UAPI_DEF_SOCKADDR_IPX			1
-+#define __UAPI_DEF_IPX_ROUTE_DEFINITION		1
-+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION	1
-+#define __UAPI_DEF_IPX_CONFIG_DATA		1
-+#define __UAPI_DEF_IPX_ROUTE_DEF		1
-+
-+/* Definitions for sys/xattr.h */
-+#if defined(_SYS_XATTR_H)
-+#define __UAPI_DEF_XATTR		0
-+#else
-+#define __UAPI_DEF_XATTR		1
-+#endif
-+
-+
- /* If we did not see any headers from any supported C libraries,
-  * or we are being included in the kernel, then define everything
-  * that we need. Check for previous __UAPI_* definitions to give
-  * unsupported C libraries a way to opt out of any kernel definition. */
--#else /* !defined(__GLIBC__) */
-+#else /* defined(__KERNEL__) */
- 
- /* Definitions for if.h */
- #ifndef __UAPI_DEF_IF_IFCONF
-@@ -266,6 +357,6 @@
- #define __UAPI_DEF_XATTR		1
- #endif
- 
--#endif /* __GLIBC__ */
-+#endif /* __KERNEL__ or __GLIBC__ or libc */
- 
- #endif /* _UAPI_LIBC_COMPAT_H */
diff --git a/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch b/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch
deleted file mode 100644
index 65a70e18443..00000000000
--- a/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -u -r linux-4.9.8-bak/include/uapi/linux/if_arp.h linux-4.9.8/include/uapi/linux/if_arp.h
---- include/uapi/linux/if_arp.h	2018-05-14 23:49:28.882768986 +0200
-+++ include/uapi/linux/if_arp.h	2018-05-14 23:50:03.156912981 +0200
-@@ -24,6 +24,7 @@
- #define _UAPI_LINUX_IF_ARP_H
- 
- #include <linux/netdevice.h>
-+#include <linux/libc-compat.h>
- 
- /* ARP protocol HARDWARE identifiers. */
- #define ARPHRD_NETROM	0		/* from KA9Q: NET/ROM pseudo	*/
-@@ -108,7 +109,7 @@
- #define	ARPOP_InREPLY	9		/* InARP reply			*/
- #define	ARPOP_NAK	10		/* (ATM)ARP NAK			*/
- 
--
-+#if __UAPI_DEF_ARPREQ
- /* ARP ioctl request. */
- struct arpreq {
-   struct sockaddr	arp_pa;		/* protocol address		*/
-@@ -117,13 +118,15 @@
-   struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
-   char			arp_dev[16];
- };
--
-+#endif
-+#if __UAPI_DEF_ARPREQ_OLD
- struct arpreq_old {
-   struct sockaddr	arp_pa;		/* protocol address		*/
-   struct sockaddr	arp_ha;		/* hardware address		*/
-   int			arp_flags;	/* flags			*/
-   struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
- };
-+#endif
- 
- /* ARP Flag values. */
- #define ATF_COM		0x02		/* completed entry (ha valid)	*/
-@@ -133,7 +136,7 @@
- #define ATF_NETMASK     0x20            /* want to use a netmask (only
- 					   for proxy entries) */
- #define ATF_DONTPUB	0x40		/* don't answer this addresses	*/
--
-+#if __UAPI_DEF_ARPHDR
- /*
-  *	This structure defines an ethernet arp header.
-  */
-@@ -156,6 +159,6 @@
- #endif
- 
- };
--
-+#endif
- 
- #endif /* _UAPI_LINUX_IF_ARP_H */
-diff -u -r linux-4.9.8-bak/include/uapi/linux/libc-compat.h linux-4.9.8/include/uapi/linux/libc-compat.h
---- include/uapi/linux/libc-compat.h	2018-05-14 23:49:28.885768999 +0200
-+++ include/uapi/linux/libc-compat.h	2018-05-14 23:50:03.156912981 +0200
-@@ -51,6 +51,11 @@
- /* We have included glibc headers... */
- #if defined(__GLIBC__)
- 
-+#define __UAPI_DEF_ETHHDR 1
-+#define __UAPI_DEF_ARPREQ 1
-+#define __UAPI_DEF_ARPREQ_OLD 1
-+#define __UAPI_DEF_ARPHDR 1
-+
- /* Coordinate with glibc net/if.h header. */
- #if defined(_NET_IF_H) && defined(__USE_MISC)
- 
-@@ -73,7 +78,6 @@
- /* Linux headers included first, and we must define everything
-  * we need. The expectation is that glibc will check the
-  * __UAPI_DEF_* defines and adjust appropriately. */
--
- #define __UAPI_DEF_IF_IFCONF 1
- #define __UAPI_DEF_IF_IFMAP 1
- #define __UAPI_DEF_IF_IFNAMSIZ 1
-@@ -256,6 +260,21 @@
- #define __UAPI_DEF_XATTR		1
- #endif
- 
-+#ifdef _NETINET_IF_ETHER_H /* musl */
-+#define __UAPI_DEF_ETHHDR 0
-+#else
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
-+#ifdef _NET_IF_ARP_H
-+#define __UAPI_DEF_ARPREQ 0
-+#define __UAPI_DEF_ARPREQ_OLD 0
-+#define __UAPI_DEF_ARPHDR 0
-+#else
-+#define __UAPI_DEF_ARPREQ 1
-+#define __UAPI_DEF_ARPREQ_OLD 1
-+#define __UAPI_DEF_ARPHDR 1
-+#endif
- 
- /* If we did not see any headers from any supported C libraries,
-  * or we are being included in the kernel, then define everything
---- include/uapi/linux/if_ether.h	2018-11-01 21:25:05.338466089 +0100
-+++ include/uapi/linux/if_ether.h	2018-11-01 21:26:07.819172903 +0100
-@@ -23,6 +23,7 @@
- #define _UAPI_LINUX_IF_ETHER_H
- 
- #include <linux/types.h>
-+#include <linux/libc-compat.h>
- 
- /*
-  *	IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
diff --git a/srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch b/srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch
deleted file mode 100644
index 970e342a97c..00000000000
--- a/srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Work around redefinition of sigcontext in libc headers
-
-Introduced with:
-https://github.com/torvalds/linux/commit/43d4da2c45b2f5d62f8a79ff7c6f95089bb24656
-
-diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
-index 98c4ce5..c44efed 100644
---- arch/arm64/include/uapi/asm/ptrace.h
-+++ arch/arm64/include/uapi/asm/ptrace.h
-@@ -23,8 +23,6 @@
- #include <linux/types.h>
- 
- #include <asm/hwcap.h>
--#include <asm/sigcontext.h>
--
- 
- /*
-  * PSR bits
-@@ -64,8 +62,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--#include <linux/prctl.h>
--
- /*
-  * User structures for general purpose, floating point and debug registers.
-  */
-
diff --git a/srcpkgs/kernel-libc-headers/patches/1-8-if_tunnel.h.patch b/srcpkgs/kernel-libc-headers/patches/1-8-if_tunnel.h.patch
new file mode 100644
index 00000000000..a7ba47afb4c
--- /dev/null
+++ b/srcpkgs/kernel-libc-headers/patches/1-8-if_tunnel.h.patch
@@ -0,0 +1,14 @@
+Reverts 1fe8e0f074c77aa41aaa579345a9e675acbebfa9
+
+--- include/uapi/linux/if_tunnel.h
++++ include/uapi/linux/if_tunnel.h
+@@ -2,9 +2,6 @@
+ #define _UAPI_IF_TUNNEL_H_
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>
+-#include <linux/ip.h>
+-#include <linux/in6.h>
+ #include <asm/byteorder.h>
+ 
+ 
diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index 2cae8e99e30..ddd9087044c 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -1,17 +1,15 @@
 # Template file for 'kernel-libc-headers'
 pkgname=kernel-libc-headers
-version=4.19.0
-revision=2
+version=5.10.4
+revision=1
 bootstrap=yes
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-wrksrc=linux-${version%.*}
-short_desc="The Linux API headers for userland development"
+wrksrc=linux-${version}
+short_desc="Linux API headers for userland development"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org"
-distfiles="$KERNEL_SITE/kernel/v4.x/linux-${version%.*}.tar.xz"
-checksum=0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+distfiles="$KERNEL_SITE/kernel/v${version%%.*}.x/linux-${version}.tar.xz"
+checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
@@ -28,12 +26,14 @@ esac
 
 do_build() {
 	make mrproper
-	make ARCH=${_arch} headers_check
+	make ARCH=${_arch} headers
 }
 do_install() {
-	make ARCH=${_arch} INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
-	# Remove unused files.
-	rm -f $(find ${DESTDIR}/usr/include -name .install -or -name ..install.cmd)
+ 	find usr/include -name '.*' -delete
+	rm usr/include/Makefile
+ 	vmkdir usr/include
+ 	vcopy usr/include usr
+
 	# Remove drm headers, use libdrm.
 	rm -rf ${DESTDIR}/usr/include/drm
 }

From fac0a3a15d8df18caa9ee49a384dc5fa9b44822d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 24 Dec 2020 00:09:10 -0600
Subject: [PATCH 118/752] sublime-text3: update to 3211.

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

diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index e87de887ad0..c693768e6e4 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,11 +1,11 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=1
+revision=2
 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="Propietary"
+license="custom:Proprietary"
 homepage="http://www.sublimetext.com/3dev"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -23,12 +23,14 @@ nopie=yes
 
 do_install() {
 	vmkdir "usr/bin"
-	vmkdir "usr/share/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/share/sublime_text"
+	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/"
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
 	done
-	ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	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
 }

From be0920b42a008657dbb8c3c50a9775e3aa1390ba Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 25 Dec 2020 20:59:23 +0100
Subject: [PATCH 119/752] python3-dkimpy: update to 1.0.5

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

diff --git a/srcpkgs/python3-dkimpy/template b/srcpkgs/python3-dkimpy/template
index 5969d1ca5c8..0993d589926 100644
--- a/srcpkgs/python3-dkimpy/template
+++ b/srcpkgs/python3-dkimpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dkimpy'
 pkgname=python3-dkimpy
-version=1.0.0
-revision=4
+version=1.0.5
+revision=1
 wrksrc="dkimpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-3-Clause"
 homepage="https://launchpad.net/dkimpy"
 distfiles="${PYPI_SITE}/d/dkimpy/dkimpy-${version}.tar.gz"
-checksum=56f37736b5527082f2389bacd804e31e9f0118043e26eff74198d5d12ae3908b
+checksum=9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121
 replaces="python-dkimpy>=0"
 provides="python-dkimpy-${version}_${revision}"
 
@@ -22,6 +22,6 @@ post_extract() {
 
 post_install() {
 	# This file is used for testing only
-	rm -f ${DESTDIR}/usr/lib/python3.?/site-packages/dkim/__main__.py
+	rm ${DESTDIR}/${py3_sitelib}/dkim/__main__.py
 	vlicense LICENSE
 }

From d7515f95178a4a3b98b2f45a306a1573fba8b98b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 28 Dec 2020 18:27:37 -0600
Subject: [PATCH 120/752] font-sarasa-gothic: update to 0.16.3.

---
 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 beea13ff433..960ac449d19 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.14.3
+version=0.16.3
 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=a8f8ceb80b3416e106712470d0bbea22ab2c284284922b04d2551ccece269ca6
+checksum=9019ba649400239db8331044f1dae5c6624c19a24d8a202bb193177d89005acc
 
 font_dirs="/usr/share/fonts/TTF"
 

From eaa0280c14ad23980c586721225dbe049f1fc2b4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 18:02:04 -0600
Subject: [PATCH 121/752] ibus-libpinyin: update to 1.12.0.

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

diff --git a/srcpkgs/ibus-libpinyin/template b/srcpkgs/ibus-libpinyin/template
index 3272612ed61..0433297004f 100644
--- a/srcpkgs/ibus-libpinyin/template
+++ b/srcpkgs/ibus-libpinyin/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-libpinyin'
 pkgname=ibus-libpinyin
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext intltool libtool pkg-config autoconf-archive
@@ -11,7 +11,7 @@ maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libpinyin/ibus-libpinyin"
 distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
-checksum=e1a83b7ea4b207cbbbc4017a806baab3592cd0cad2fdb5a3594d058fbdf07f27
+checksum=1fe023d3416f1be6284e23fd977cae58e3e5eddbc5582e6e8aa7bb82b3751ddd
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From f8b54519c395f39bb8d47ca802d65ed4b2e5927f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 17:57:42 -0600
Subject: [PATCH 122/752] libpinyin: update to 2.6.0.

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

diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index d5f3b5ef655..363ee5f0fe2 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,6 +1,6 @@
 # Template file for 'libpinyin'
 pkgname=libpinyin
-version=2.3.0
+version=2.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/libpinyin/libpinyin"
 changelog="https://raw.githubusercontent.com/libpinyin/libpinyin/${version}/ChangeLog"
 distfiles="https://github.com/libpinyin/libpinyin/archive/${version}.tar.gz"
-checksum=00cb09f267031fb528bebc4621268037fca64677040123ebb184a50afcb43430
+checksum=2b52f617a99567a8ace478ee82ccc62d1761e3d1db2f1e05ba05b416708c35d2
 nocross="Requires data generators compiled against target system"
 
 pre_configure() {

From a5f760159383601adee455f28082b47196126441 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 5 Jan 2021 12:24:48 -0600
Subject: [PATCH 123/752] libredwg: update to 0.12.

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

diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index 90febf9a370..cd4cb0c322b 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,6 +1,6 @@
 # Template file for 'libredwg'
 pkgname=libredwg
-version=0.11.1
+version=0.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-bindings"
@@ -11,7 +11,11 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libredwg/"
 distfiles="https://github.com/LibreDWG/libredwg/releases/download/${version}/libredwg-${version}.tar.xz"
-checksum=e96499ed0db8fc19d733e2df1e04d155cca2d1baaaac6d78ac8efd4d4f8a224b
+checksum=24cdcdf511909ec41500d265258a528c72dd046982906d475738748ea221fdf8
+
+post_install() {
+	rm ${DESTDIR}/usr/share/{dwgadd.example,load_dwg.py}
+}
 
 libredwg-tools_package() {
 	short_desc+=" - utilities"

From 5d035eba5d6c4bb030f5d7db316f2a70ce59482e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 28 Dec 2020 18:16:18 -0600
Subject: [PATCH 124/752] libjcat: update to 0.1.4.

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

diff --git a/srcpkgs/libjcat/template b/srcpkgs/libjcat/template
index 246633058a1..1fe26173ce3 100644
--- a/srcpkgs/libjcat/template
+++ b/srcpkgs/libjcat/template
@@ -1,19 +1,20 @@
 # Template file for 'libjcat'
 pkgname=libjcat
-version=0.1.2
+version=0.1.4
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gnutls-tools pkg-config vala"
 makedepends="json-glib-devel gnutls-devel gpgme-devel"
+checkdepends="gnupg"
 short_desc="Library for reading and writing Jcat files"
 maintainer="marmeladema <xademax@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libjcat"
 distfiles="https://github.com/hughsie/libjcat/archive/${version}.tar.gz"
-checksum=b80a31a872d5612fa98ac0cfe483e4d33f5b02777427864ff5305bfd33a11aa0
+checksum=d2f9d554b9d91abc59ff5e10d79801d30e3efcfcb27cd4cee9688381f51a3832
 
-if [ -n "$XBPS_CROSS_BUILD" ]; then
+if [ "$XBPS_CROSS_BUILD" ]; then
 	configure_args="-Dman=false"
 else
 	hostmakedepends+=" help2man"

From 42ac3864fb6ec4f1a4499db60ff19ad428ed92a9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 28 Dec 2020 18:37:33 -0600
Subject: [PATCH 125/752] gmsl: update to 1.1.9.

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

diff --git a/srcpkgs/gmsl/template b/srcpkgs/gmsl/template
index e58b59e74b7..aa4fa76c027 100644
--- a/srcpkgs/gmsl/template
+++ b/srcpkgs/gmsl/template
@@ -1,15 +1,14 @@
 # Template file for 'gmsl'
 pkgname=gmsl
-version=1.1.8
-revision=2
-create_wrksrc=yes
+version=1.1.9
+revision=1
 depends="make"
 short_desc="GNU Make Standard Library"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="BSD-3-Clause"
 homepage="https://sourceforge.net/projects/gmsl/"
 distfiles="${SOURCEFORGE_SITE}/gmsl/gmsl-${version}.tar.gz"
-checksum=d569bcf5ec3ce0fd3f9948066ca0bbbf2d25cf529d61dd65e30c941f0eb1adcd
+checksum=e9829575cddc5502aa95073530f5eb6b6814f676a3c1ba6d46400a4278ab9cd4
 
 do_check() {
 	make -f gmsl-tests
@@ -18,9 +17,8 @@ do_check() {
 do_install() {
 	vinstall gmsl 644 usr/include
 	vinstall __gmsl 644 usr/include
-	vdoc index.html
 	vdoc README
 
-	sed --quiet '8,38p' gmsl >LICENSE
+	sed -n '/Copyright/,/SUCH DAMAGE/p' gmsl >LICENSE
 	vlicense LICENSE
 }

From 1af9106db9fe61aa8cc9ff8c4fcca68c42aec78b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 6 Jan 2021 00:02:07 +0100
Subject: [PATCH 126/752] kernel-libc-headers: clean up build/install

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

diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index ddd9087044c..ff67067469e 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -27,13 +27,11 @@ esac
 do_build() {
 	make mrproper
 	make ARCH=${_arch} headers
-}
-do_install() {
+	# remove extra files and drm headers
  	find usr/include -name '.*' -delete
 	rm usr/include/Makefile
- 	vmkdir usr/include
+	rm -rf usr/include/drm
+}
+do_install() {
  	vcopy usr/include usr
-
-	# Remove drm headers, use libdrm.
-	rm -rf ${DESTDIR}/usr/include/drm
 }

From c08648907098ce5545d87bb7044bfa01bfd998f8 Mon Sep 17 00:00:00 2001
From: Nicolas Porcel <nicolasporcel06@gmail.com>
Date: Tue, 5 Jan 2021 19:31:11 +0000
Subject: [PATCH 127/752] mlocate: fix updatedb.conf alternative link

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

diff --git a/srcpkgs/mlocate/template b/srcpkgs/mlocate/template
index 33d5a9d6238..9571f8c387d 100644
--- a/srcpkgs/mlocate/template
+++ b/srcpkgs/mlocate/template
@@ -1,7 +1,7 @@
 # Template file for 'mlocate'
 pkgname=mlocate
 version=0.26
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--program-prefix=m --localstatedir=/var/lib"
 make_build_args="groupname=_mlocate"
@@ -19,7 +19,7 @@ alternatives="
  locate:locate:/usr/bin/mlocate
  locate:locate.1:/usr/share/man/man1/mlocate.1
  locate:locatedb.5:/usr/share/man/man5/mmlocate.db.5
- locate:updatedb.conf.5:/usr/share/man/man5/mupdatedb.db.5
+ locate:updatedb.conf.5:/usr/share/man/man5/mupdatedb.conf.5
  locate:updatedb:/usr/bin/mupdatedb
  locate:updatedb.1:/usr/share/man/man1/mupdatedb.1"
 

From 0e81dcbcf4a64831f8dab7c5ed913ec9e9556bd9 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Wed, 6 Jan 2021 09:46:48 +0900
Subject: [PATCH 128/752] delta: update to 0.5.1

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/delta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 0373afe2af58c2235078550fa7f9ce28fc6c7106 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Wed, 6 Jan 2021 01:22:33 +0100
Subject: [PATCH 129/752] visidata: update to 2.1.1.

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

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index f0f73fe5024..c95ceb254c1 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,6 +1,6 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.1
+version=2.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=29e80e81bd4523ea5ac8bf34b18e74fd77470e2370373ef32b5ec02c7ce67494
+checksum=f33ebe21fa6b6aaffd7bf1540b6a0da3b1e816d5b32df563f7b3cd40040d55dd

From aba446d58ee1a57648c4b48007ec12298470e687 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Tue, 5 Jan 2021 23:31:44 +0000
Subject: [PATCH 130/752] bottom: update to 0.5.6

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

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index 76c1b38fa2f..b7065802fa7 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.5.4
+version=0.5.6
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -8,7 +8,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=a53984a944ee05d761c95d601b3778f4258a76a59a4fa562d4c77480f06ef8dd
+checksum=e6b41796cd54dcf67c8b265a81db8275d8557c6b41a48b9ded0a99ce9f9c0d2c
 
 post_install() {
 	vdoc README.md

From 343a7abfa13223a2e4fdded98b561e9f1e031d41 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 5 Jan 2021 10:58:06 +0100
Subject: [PATCH 131/752] zoom: update to 5.4.57450.1220

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index fbe5ba0e7d3..6bf998ec56f 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.4.56259.1207
+version=5.4.57450.1220
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -12,7 +12,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=ebd14ca1c7d53e8b75311f2731a6b78691095a8f1548d3a13b6b8a81e9b4a344
+checksum=e8762567f7fa957aa072fab2b090b84c1b8838c99d35354935d30c2fdc08253d
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 71ca1eda263b70b7c4415076bcb6f73778bb30d7 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 5 Jan 2021 12:38:54 +0100
Subject: [PATCH 132/752] pass-git-helper: update to 1.1.1.

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

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index e891b69c183..a9500f81b99 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,13 +1,14 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
-version=1.1.0
-revision=4
+version=1.1.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-xdg"
+checkdepends="python3-pytest-cov python3-pytest-mock python3-xdg"
 short_desc="Git credential helper interfacing with pass"
 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=85c9e2f1f544227da9129503d91ce5d502be127c83ad24cbc6dc8ba3ab746b8e
+checksum=17a4c36d0fe67a7a4a709da3c0649d10efb02df266e62765661eac2ced4bc03d

From ffc5c00e968775b0e20b6fd6fdf0bbaaaed6952f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 5 Jan 2021 19:06:19 +0200
Subject: [PATCH 133/752] gscreenshot: update to 2.13.0.

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

diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index 524ef0918eb..f11fc62532c 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,13 +1,14 @@
 # Template file for 'gscreenshot'
 pkgname=gscreenshot
-version=2.12.1
-revision=2
+version=2.13.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="gtk+3 python3-setuptools python3-Pillow python3-gobject scrot"
+checkdepends="$depends"
 short_desc="GUI front-end for the scrot program"
 maintainer="Rui Flora <rui.flora@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/thenaterhood/gscreenshot"
 distfiles="https://github.com/thenaterhood/gscreenshot/archive/v${version}.tar.gz"
-checksum=e50408d6ddf07ebae9ea9bfbe1cd943733f2ae2b189a56df79495ef6c10be2cf
+checksum=a528892eb761fc628dee4372b63a02d92d12c14ddddbf4f0aa56047cfa015d92

From 8dae4f0ec659e334982d1644fb28a05313193492 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 5 Jan 2021 12:50:23 +0100
Subject: [PATCH 134/752] lutris: update to 0.5.8.2.

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

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 0bde20c4020..b43458c3d0a 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,6 +1,6 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.8.1
+version=0.5.8.2
 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=9eba9ccc89069a1b23f1776c8533d6d0513c184f2f090428ec52bae63333138b
+checksum=6c2ac4810764fbae9fc6b4e68fb76c47371046ac4e5bdf9e7fcd9777d1b9d8c7

From 3be06595f61119f5405affb09f960bfc7cd3b329 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 5 Jan 2021 13:23:52 +0100
Subject: [PATCH 135/752] xmobar: update to 0.37

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

diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index c4934bb9591..81ae92fd294 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,6 +1,6 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.36
+version=0.37
 revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
 homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=b4e9ab4a051c8b6db59397069a64ccc770459cd642cc2df81ff558ac5f53164f
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"

From 405979be26b60b415a4b6dc77f7c52a7b45aa9aa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 5 Jan 2021 19:15:25 +0200
Subject: [PATCH 136/752] shared-mime-info: update to 2.1.

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

diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index 390636ffe50..08e0fe64631 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -1,6 +1,6 @@
 # Template file for 'shared-mime-info'
 pkgname=shared-mime-info
-version=2.0
+version=2.1
 revision=1
 build_style=meson
 configure_args="-Dupdate-mimedb=false"
@@ -10,6 +10,6 @@ short_desc="Core database of common types"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://freedesktop.org/Software/shared-mime-info"
-distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-${version}.tar.xz"
-checksum=23c1cb7919f31cf97aeb5225548f75705f706aa5cc7d1c4c503364bcc8681e06
+distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-${version}.tar.xz"
+checksum=b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563
 disable_parallel_build=yes

From 6826eb48c71b24e74a7fb69267bc34061c5a4b34 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Tue, 5 Jan 2021 16:56:59 -0800
Subject: [PATCH 137/752] tcl: don't build unnecessary compatibility functions.

./configure-time tests are incorrectly flagging some libc functions as
broken when cross-compiling.  Hard-code correct results of tests.
Without this patch, it seems that I cannot link some things (tclx)
against tcl on aarch64.
---
 srcpkgs/tcl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index d4c77cfd4e6..191acaf46c3 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -1,13 +1,14 @@
 # Template file for 'tcl'
 pkgname=tcl
 version=8.6.10
-revision=2
+revision=3
 wrksrc="tcl${version}"
 build_wrksrc=unix
 build_style=gnu-configure
 configure_args="--enable-threads --without-tzdata --enable-man-symlinks
  --disable-static --disable-rpath --with-system-sqlite
- tcl_cv_strtod_unbroken=ok"
+ tcl_cv_strstr_unbroken=ok
+ tcl_cv_strtoul_unbroken=ok"
 makedepends="zlib-devel sqlite-devel"
 short_desc="TCL scripting language"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ff54af88352171cb8d3a77e771480ae6c92f8ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 5 Jan 2021 18:55:01 +0100
Subject: [PATCH 138/752] qpdf: update to 10.1.0.

Closes: #27695 [via git-merge-pr]
---
 srcpkgs/qpdf/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index f717d60ea36..cf58e81e445 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,10 +1,10 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.0.4
+version=10.1.0
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
-hostmakedepends="gettext tar"
+hostmakedepends="perl gettext tar"
 makedepends="pcre-devel libjpeg-turbo-devel"
 short_desc="Content-Preserving PDF Transformation System"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
@@ -12,13 +12,20 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=40924c0894eb3b6d228a2b0135c77772a34aeb4cac5f0a518cd6cd7aa198640a
+checksum=e0516398ac1cdaa1ebce2b822ccdd8afbadea43b0b57304c147a17639a1402b0
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS+=" -latomic"
 fi
 
+do_check() {
+	# libtsdc++ throws an exception on musl if std::locale("") is used, since
+	# its generic locale implementation only supports the C locale.
+	# by forcing LANG=C, no exception is thrown and the test suite can run to completion
+	LANG=C make check
+}
+
 libqpdf_package() {
 	short_desc+=" - shared library"
 	pkg_install() {

From e3155ea0c9925136ad17733f61c41701be28c3ae Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Wed, 6 Jan 2021 15:25:31 +0600
Subject: [PATCH 139/752] opera: update to 73.0.3856.329.

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

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 32cec2dd2de..2d19dfb7822 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=73.0.3856.284
+version=73.0.3856.329
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=3afe7f91c6b0e082680a8483acaf2bd286f44931f896355181dda928ba1a8eb4
+checksum=ff03c0f8f969038521b82b2f3c47dddf52921266adcc9ccb0860f4e8e38ce048
 repository="nonfree"
 nostrip=yes
 

From 5ae93d35ffa3916cfdd05464758da665f145371b Mon Sep 17 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, 29 Dec 2020 08:01:59 +0700
Subject: [PATCH 140/752] genius: update to 1.0.25.

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

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index d8228ab28be..395d5c530a0 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,16 +1,23 @@
 # Template file for 'genius'
 pkgname=genius
-version=1.0.24
-revision=2
+version=1.0.25
+revision=1
 build_style=gnu-configure
-configure_args="--disable-update-mimedb"
-hostmakedepends="intltool pkg-config"
-makedepends="gtksourceview2-devel mpfr-devel readline-devel vte-devel"
+configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
+ GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
+hostmakedepends="intltool pkg-config glib-devel automake libtool bison flex"
+makedepends="gtksourceview4-devel mpfr-devel readline-devel ncurses-devel
+ gtk+3-devel amtk-devel libglib-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Advanced calculator including a mathematical programming language"
 maintainer="Samadi van Koten <samadi@vktec.co.uk>"
 license="GPL-3.0-or-later"
 homepage="http://www.jirka.org/genius.html"
 distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.xz"
-checksum=8dea7f386821f39a438c66d5201a741904555c878dc670b96b8a22a8a96dca50
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/252374514"
+checksum=0e92c9a22f903012ef331c20ada5b30b6c666c0f11753958b8e38d720deb6e0c
+nocross="run the binaries"
+
+post_patch() {
+	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
+	autoreconf -fi
+}

From f608cd38c8fe8d340cf6b5162ef60cc9c4ac6e9e Mon Sep 17 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, 29 Dec 2020 08:16:58 +0700
Subject: [PATCH 141/752] gtkdialog: remove

Abandon upstream from at least 2007
---
 srcpkgs/gtkdialog/template | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 srcpkgs/gtkdialog/template

diff --git a/srcpkgs/gtkdialog/template b/srcpkgs/gtkdialog/template
deleted file mode 100644
index 7311db4ef1e..00000000000
--- a/srcpkgs/gtkdialog/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'gtkdialog'
-pkgname=gtkdialog
-version=0.8.3
-revision=4
-build_style=gnu-configure
-make_install_args="UPDATE_ICON_CACHE=true"
-hostmakedepends="pkg-config flex"
-makedepends="gtk+-devel libglade-devel vte-devel"
-depends="hicolor-icon-theme"
-short_desc="A small utility for fast and easy GUI building"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://code.google.com/p/gtkdialog/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-${version}.tar.gz"
-checksum=ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e
-
-CFLAGS="-fcommon"
-
-post_install() {
-	vmkdir usr/share/doc/$pkgname
-	cp -a examples ${DESTDIR}/usr/share/doc/$pkgname/examples
-}

From 06489f24f1222330571ad3754174d791d6ad52ac Mon Sep 17 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, 29 Dec 2020 08:50:40 +0700
Subject: [PATCH 142/752] lilyterm: update to 0.9.9.4+20190725.

---
 srcpkgs/lilyterm/patches/lilyterm-musl.patch  | 17 ++++---
 .../lilyterm/patches/lilyterm-pkgconfig.patch | 22 ---------
 .../no-empty-environment-variables.patch      | 21 ++++++++
 srcpkgs/lilyterm/template                     | 49 ++++++++++++++++---
 4 files changed, 73 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
 create mode 100644 srcpkgs/lilyterm/patches/no-empty-environment-variables.patch

diff --git a/srcpkgs/lilyterm/patches/lilyterm-musl.patch b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
index 28778e85799..5cd2fe64014 100644
--- a/srcpkgs/lilyterm/patches/lilyterm-musl.patch
+++ b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
@@ -1,14 +1,17 @@
---- src/profile.c.orig	2016-05-07 00:22:09.702161948 +0900
-+++ src/profile.c	2016-05-07 00:24:21.566170424 +0900
-@@ -2660,11 +2660,7 @@
+diff --git src/profile.c src/profile.c
+index 3de9fb5..b7dc71f 100644
+--- src/profile.c
++++ src/profile.c
+@@ -2974,12 +2974,8 @@ GString *save_user_settings(GtkWidget *widget, struct Window *win_data)
  	// g_debug("save_user_settings(): profile = %s", profile);
  
  	// g_debug("\n%s", contents->str);
--#ifdef BSD
- 	gchar *real_file_name = realpath((const gchar *)profile, NULL);
--#else
+-#  ifdef BSD
+ 	gchar resolved_patch[PATH_MAX+1];
+ 	gchar *real_file_name = g_strdup(realpath((const gchar *)profile, resolved_patch));
+-#  else
 -	gchar *real_file_name = canonicalize_file_name((const gchar *)profile);
--#endif
+-#  endif
  	if (real_file_name==NULL)
  	{
  		//if (access(profile, F_OK))
diff --git a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch b/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
deleted file mode 100644
index 6bff0be35a9..00000000000
--- a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2016-05-08 15:18:37.105172865 +0900
-+++ configure	2016-05-08 15:18:25.159172097 +0900
-@@ -138,7 +138,7 @@
-   exit 0
- fi
- 
--PKGCONFIG=`whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$" | head -n 1`
-+PKGCONFIG=`which pkg-config`
- if [ -z "$PKGCONFIG" ]; then
-   ERR "\n  ERROR: \`"
-   WARN "pkg-config"
---- src/Makefile.orig	2016-05-08 15:19:20.502175654 +0900
-+++ src/Makefile	2016-05-08 15:20:22.909179665 +0900
-@@ -22,7 +22,7 @@
- include ../.default
- -include ../.config
- 
--PKGCONFIG := $(shell whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$$" | head -n 1)
-+PKGCONFIG := $(shell which pkg-config)
- 
- VTE ?= ""
- 
diff --git a/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
new file mode 100644
index 00000000000..69b8a8f3c51
--- /dev/null
+++ b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
@@ -0,0 +1,21 @@
+diff --git src/notebook.c src/notebook.c
+index eb4d973..0789a33 100644
+--- src/notebook.c
++++ src/notebook.c
+@@ -158,13 +158,13 @@ struct Page *add_page(struct Window *win_data,
+ #ifdef ENABLE_SET_EMULATION
+ #  ifdef SAFEMODE
+ 	if (win_data->emulate_term == NULL)
+-		g_string_append_printf (environ_str, "TERM=xterm");
++		g_string_append_printf (environ_str, "TERM=xterm\t");
+ 	else
+ #  endif
+-		g_string_append_printf (environ_str, "TERM=%s", win_data->emulate_term);
++		g_string_append_printf (environ_str, "TERM=%s\t", win_data->emulate_term);
+ #endif
+ 	// set colorterm
+-	g_string_append_printf (environ_str, "\tCOLORTERM=lilyterm");
++	g_string_append_printf (environ_str, "COLORTERM=lilyterm");
+ 
+ // ---- Setting the VTE_CJK_WIDTH environment ---- //
+ 
diff --git a/srcpkgs/lilyterm/template b/srcpkgs/lilyterm/template
index 7728486a60e..31bc2ad9dc0 100644
--- a/srcpkgs/lilyterm/template
+++ b/srcpkgs/lilyterm/template
@@ -1,15 +1,50 @@
 # Template file for 'lilyterm'
 pkgname=lilyterm
-version=0.9.9.4
-revision=2
-build_style="gnu-configure"
-hostmakedepends="pkg-config which"
-makedepends="vte-devel gtk+-devel"
+_githash=faf1254f46049edfb1fd6e9191e78b1b23b9c51d
+version=0.9.9.4+20190725
+revision=1
+wrksrc=LilyTerm-$_githash
+build_style="gnu-makefile"
+hostmakedepends="pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel"
 short_desc="Fast and lightweight terminal emulator based off of libvte"
 maintainer="Kris Scott <kris@syntosis.net>"
 license="GPL-3.0-or-later"
 homepage="http://lilyterm.luna.com.tw"
-distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+# distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+distfiles="https://github.com/Tetralet/LilyTerm/archive/$_githash.tar.gz"
 conf_files="/etc/lilyterm.conf"
-checksum="b72626431d4f5645e0e0f18449319fbb69bef4eab4345d5e37cde0ae712a5d74"
+checksum=e777122cb4db0c75b893368aa5a3ae7de1bdfe27e1efb8fad8f9c19acb0a802e
 CFLAGS="-Wno-deprecated-declarations"
+
+post_patch() {
+	vsed -i -e '/LDFLAGS.*BINARY/s/$/ -lX11/' \
+		-e '/^PKGCONFIG :=/d' \
+		-e '/^STRIP :=/d' \
+		src/Makefile
+}
+
+do_configure() {
+	cat <<-_EOF >.config
+	BSD = 0
+	PREFIX = /usr
+	prefix = /usr
+	ETCDIR = /etc
+	NLS = Y
+	VERBOSITY = Y
+	DEBUG = N
+	SAFEMODE = Y
+	FORCE_ENABLE_VTE_BACKGROUND = N
+	CC = $CC
+	STRIP = $STRIP
+	CPPFLAGS = $CPPFLAGS
+	CFLAGS = $CFLAGS
+	LDFLAGS = $LDFLAGS
+	MAKE = make
+	GTK = gtk+-3.0
+	VTE = vte-2.91
+	GNOME_CONTROL_CENTER = N
+	PACKAGE = lilyterm
+	PKGCONFIG = $PKG_CONFIG
+	_EOF
+}

From 42f86ea545a99c1f891aa92a395f19403a288fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 22:30:08 +0700
Subject: [PATCH 143/752] vte: remove

---
 srcpkgs/removed-packages/template       |   5 +-
 srcpkgs/vte-devel                       |   1 -
 srcpkgs/vte-python                      |   1 -
 srcpkgs/vte/patches/CVE-2012-2738.patch | 137 ------------------------
 srcpkgs/vte/patches/alt-key.patch       |  70 ------------
 srcpkgs/vte/patches/fix-includes.patch  |  10 --
 srcpkgs/vte/patches/scroll_region.patch |  65 -----------
 srcpkgs/vte/template                    |  43 --------
 srcpkgs/vte/update                      |   1 -
 9 files changed, 4 insertions(+), 329 deletions(-)
 delete mode 120000 srcpkgs/vte-devel
 delete mode 120000 srcpkgs/vte-python
 delete mode 100644 srcpkgs/vte/patches/CVE-2012-2738.patch
 delete mode 100644 srcpkgs/vte/patches/alt-key.patch
 delete mode 100644 srcpkgs/vte/patches/fix-includes.patch
 delete mode 100644 srcpkgs/vte/patches/scroll_region.patch
 delete mode 100644 srcpkgs/vte/template
 delete mode 100644 srcpkgs/vte/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bc175313071..e0f6a5c17b8 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=1
+revision=2
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -77,6 +77,9 @@ replaces="
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
  varnish<=6.1.1_3
+ vte<=0.28.2_16
+ vte-devel<=0.28.2_16
+ vte-python<=0.28.2_16
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
  yt-play<=20140117_2
diff --git a/srcpkgs/vte-devel b/srcpkgs/vte-devel
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-devel
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte-python b/srcpkgs/vte-python
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-python
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte/patches/CVE-2012-2738.patch b/srcpkgs/vte/patches/CVE-2012-2738.patch
deleted file mode 100644
index 0a900a4f62c..00000000000
--- a/srcpkgs/vte/patches/CVE-2012-2738.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Upstream-Status: Backport
-CVE: CVE-2012-2738
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 19:36:09 +0200
-Subject: [PATCH 1/2] emulation: Limit integer arguments to 65535
-
-To guard against malicious sequences containing excessively big numbers,
-limit all parsed numbers to 16 bit range. Doing this here in the parsing
-routine is a catch-all guard; this doesn't preclude enforcing
-more stringent limits in the handlers themselves.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/table.c  | 2 +-
- src/vteseq.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- src/table.c
-+++ src/table.c
-@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
- 		if (G_UNLIKELY (*array == NULL)) {
- 			*array = g_value_array_new(1);
- 		}
--		g_value_set_long(&value, total);
-+		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
- 		g_value_array_append(*array, &value);
- 	} while (i++ < arginfo->length);
- 	g_value_unset(&value);
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 7ef4c8c..10991db 100644
---- src/vteseq.c
-+++ src/vteseq.c
-@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
-                               GValueArray *params,
-                               VteTerminalSequenceHandler handler)
- {
--        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
-+        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
- }
- 
- static void
--- 
-2.4.9 (Apple Git-60)
-
-
-From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 20:04:12 +0200
-Subject: [PATCH 2/2] emulation: Limit repetitions
-
-Don't allow malicious sequences to cause excessive repetitions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/vteseq.c | 25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 10991db..209522f 100644
---- src/vteseq.c
-+++ src/vteseq.c
-@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
- {
--	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
-+	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
- }
- 
- /* Delete a line at the current cursor position. */
-@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
- {
--	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
-+	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
- }
- 
- /* Save cursor (position). */
-@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- {
- 	GValue *value;
- 	VteScreen *screen;
--	long param, end, row;
--	int i;
-+	long param, end, row, i, limit;
- 	screen = terminal->pvt->screen;
- 	/* The default is one. */
- 	param = 1;
-@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- 	} else {
- 		end = screen->insert_delta + terminal->row_count - 1;
- 	}
--	/* Insert the new lines at the cursor. */
-+
-+	/* Only allow to insert as many lines as there are between this row
-+         * and the end of the scrolling region. See bug #676090.
-+         */
-+        limit = end - row + 1;
-+        param = MIN (param, limit);
-+
- 	for (i = 0; i < param; i++) {
- 		/* Clear a line off the end of the region and add one to the
- 		 * top of the region. */
-@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- {
- 	GValue *value;
- 	VteScreen *screen;
--	long param, end, row;
--	int i;
-+	long param, end, row, i, limit;
- 
- 	screen = terminal->pvt->screen;
- 	/* The default is one. */
-@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- 	} else {
- 		end = screen->insert_delta + terminal->row_count - 1;
- 	}
-+
-+        /* Only allow to delete as many lines as there are between this row
-+         * and the end of the scrolling region. See bug #676090.
-+         */
-+        limit = end - row + 1;
-+        param = MIN (param, limit);
-+
- 	/* Clear them from below the current cursor. */
- 	for (i = 0; i < param; i++) {
- 		/* Insert a line at the end of the region and remove one from
--- 
-2.4.9 (Apple Git-60)
-
-
diff --git a/srcpkgs/vte/patches/alt-key.patch b/srcpkgs/vte/patches/alt-key.patch
deleted file mode 100644
index ad8d2fcedfc..00000000000
--- a/srcpkgs/vte/patches/alt-key.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 15 Nov 2011 03:06:40 -0500
-Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
- compatibility
-
-Also, since VTE_META_MASK is now a mask with multiple bits set, code that
-compares gdk key modifiers to VTE_META_MASK by numerical equality is no
-longer guaranteed to work. Therefore, for such comparisons a new function,
-vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
-matching matching VTE_META_MASK are set, then all are set.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663779
----
- src/keymap.c |   15 +++++++++++++--
- src/keymap.h |    2 +-
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
---- src/keymap.c
-+++ src/keymap.c
-@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
- 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
- };
- 
-+/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
-+ * despite being a compound mask, is treated as indivisible. */
-+GdkModifierType
-+_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
-+		GdkModifierType mask)
-+{
-+	if (modifiers & VTE_META_MASK)
-+		modifiers |= VTE_META_MASK;
-+	return modifiers & mask;
-+}
-+
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
-  * a literal string or a capability name. */
- void
-@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
- 	} else {
- 		fkey_mode = fkey_default;
- 	}
--	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
-+	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
- 
- 	/* Search for the conditions. */
- 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
-@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
- 		return;
- 	}
- 
--	switch (modifiers & significant_modifiers) {
-+	switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
- 	case 0:
- 		modifier = 0;
- 		break;
---- src/keymap.h
-+++ src/keymap.h
-@@ -27,7 +27,7 @@
- 
- G_BEGIN_DECLS
- 
--#define VTE_META_MASK		GDK_META_MASK
-+#define VTE_META_MASK		(GDK_META_MASK | GDK_MOD1_MASK)
- #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
- 
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
--- 
-1.7.8.rc3
-
diff --git a/srcpkgs/vte/patches/fix-includes.patch b/srcpkgs/vte/patches/fix-includes.patch
deleted file mode 100644
index f810501110a..00000000000
--- a/srcpkgs/vte/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pty.c
-+++ src/pty.c
-@@ -28,6 +28,7 @@
-  * Since: 0.26
-  */
- 
-+#define _GNU_SOURCE
- #include <config.h>
- 
- #include "vtepty.h"
diff --git a/srcpkgs/vte/patches/scroll_region.patch b/srcpkgs/vte/patches/scroll_region.patch
deleted file mode 100644
index 1def57e8f0d..00000000000
--- a/srcpkgs/vte/patches/scroll_region.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/vte.c	2010-11-30 23:04:53.000000000 -0800
-+++ src/vte.c	2010-12-07 20:05:07.865548000 -0800
-@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
- 	long wcount, start, delta;
- 	gboolean leftovers, modified, bottom, again;
- 	gboolean invalidated_text;
-+	gboolean in_scroll_region;
- 	GArray *unichars;
- 	struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
- 
-@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
- 	cursor = screen->cursor_current;
- 	cursor_visible = terminal->pvt->cursor_visible;
- 
-+	in_scroll_region = screen->scrolling_restricted
-+	    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
-+	    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
-+
- 	/* We should only be called when there's data to process. */
- 	g_assert(terminal->pvt->incoming ||
- 		 (terminal->pvt->pending->len > 0));
-@@ -3979,6 +3984,8 @@ skip_chunk:
- 		 * points to the first character which isn't part of this
- 		 * sequence. */
- 		if ((match != NULL) && (match[0] != '\0')) {
-+			gboolean new_in_scroll_region;
-+
- 			/* Call the right sequence handler for the requested
- 			 * behavior. */
- 			_vte_terminal_handle_sequence(terminal,
-@@ -3989,12 +3996,20 @@ skip_chunk:
- 			start = (next - wbuf);
- 			modified = TRUE;
- 
--			/* if we have moved during the sequence handler, restart the bbox */
-+			new_in_scroll_region = screen->scrolling_restricted
-+			    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
-+			    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
-+
-+			delta = screen->scroll_delta;	/* delta may have changed from sequence. */
-+
-+			/* if we have moved greatly during the sequence handler, or moved into a scroll_region
-+                         * from outside it, restart the bbox */
- 			if (invalidated_text &&
--					(screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
--					 screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
--					 screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
--					 screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
-+					((new_in_scroll_region && !in_scroll_region) ||
-+					 (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
-+					  screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
-+					  screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
-+					  screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
- 				/* Clip off any part of the box which isn't already on-screen. */
- 				bbox_topleft.x = MAX(bbox_topleft.x, 0);
- 				bbox_topleft.y = MAX(bbox_topleft.y, delta);
-@@ -4014,6 +4029,8 @@ skip_chunk:
- 				bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
- 				bbox_topleft.x = bbox_topleft.y = G_MAXINT;
- 			}
-+
-+			in_scroll_region = new_in_scroll_region;
- 		} else
- 		/* Second, we have a NULL match, and next points to the very
- 		 * next character in the buffer.  Insert the character which
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
deleted file mode 100644
index ce765732e52..00000000000
--- a/srcpkgs/vte/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vte'
-pkgname=vte
-version=0.28.2
-revision=16
-build_style=gnu-configure
-configure_args="PYTHON=python2 --disable-static --with-gtk=2.0"
-hostmakedepends="automake gettext-devel gtk-doc gobject-introspection libtool
- pkg-config intltool python-devel glib-devel pygtk-devel"
-makedepends="gtk+-devel ncurses-devel python-devel pygtk-devel"
-short_desc="Terminal widget with improved accessibility and I18N support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/vte/0.28/${pkgname}-${version}.tar.bz2"
-checksum=8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903
-
-pre_configure() {
-	NOCONFIGURE=1 autoreconf -fi
-	if [ "$CROSS_BUILD" ]; then
-		sed -i "s,\(PYTHON_INCLUDES\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
-	fi
-}
-
-vte-python_package() {
-	lib32disabled=yes
-	depends="pygtk"
-	short_desc+=" -- Python bindings"
-	pkg_install() {
-		vmove "usr/lib/python*"
-		vmove "usr/share/pygtk*"
-	}
-}
-
-vte-devel_package() {
-	depends="libglib-devel pango-devel cairo-devel gtk+-devel vte>=${version}_${revision}"
-	short_desc+=" -- development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
-	}
-}
diff --git a/srcpkgs/vte/update b/srcpkgs/vte/update
deleted file mode 100644
index 13baac4b856..00000000000
--- a/srcpkgs/vte/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[!0].* 0.[!2]*"

From 3b19744c5c5b40443dea5f42c17c3b8c1f21087b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:37:44 +0100
Subject: [PATCH 144/752] bluedevil: update to 5.20.5

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

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 54d8a9bd3a3..78edbcd99d6 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.20.4
+version=5.20.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=522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129
+checksum=b3de4e903c5669a63688940513ab7035b90d5950635c824857ad8d6a9adbeb2e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From ca88046360708b92e76cd7078aa2812f238f21f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:37:46 +0100
Subject: [PATCH 145/752] breeze-gtk: update to 5.20.5

[ci skip]
---
 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 9066de0914c..43adc80f87d 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.20.4
+version=5.20.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=8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d
+checksum=b4b4ce599bd23bf54101bdac7417daa4921b297b232622dc5a8a3426b97676ca
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From d93e9da97f59d474f50f97c4fc0690fbb093803d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:37:56 +0100
Subject: [PATCH 146/752] breeze: update to 5.20.5

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

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index c2a7ca67a0b..ee473745286 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.20.4
+version=5.20.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=b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f
+checksum=d43845a34e08d393bac182d9ede863950d33e207c7f2841a8cd419aa182cf507
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 218e9c7ea89290c2f18ccb7409fa7af5b1180c1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:37:59 +0100
Subject: [PATCH 147/752] kactivitymanagerd: update to 5.20.5

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

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 9834a18f0f7..f6e36c88d07 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.20.4
+version=5.20.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"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34
+checksum=c800c2782884cdbb906c99709f8bbce4a45c5b9abde73cf4fa5222acf8d0facb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From f9d18dc5674b3f000d885350e5859513d6c4decd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:01 +0100
Subject: [PATCH 148/752] kde-cli-tools: update to 5.20.5

[ci skip]
---
 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 a8cf355d9ee..e891774140f 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.20.4
+version=5.20.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=55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3
+checksum=0440b2d0359bca871134bfdbcc71b72c22af8c88601f1abceb83219a1877627c
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 785bb79110e71cd440f2d0b07f99f2190db45c30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:03 +0100
Subject: [PATCH 149/752] kde-gtk-config5: update to 5.20.5

[ci skip]
---
 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 f4848a8c551..2c3baa97dc4 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.20.4
+version=5.20.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=db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1
+checksum=39a8dd1c143d741846017dc351ccd9161e1dfd710e3d18609327f30044de6eb8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From f8baaced0cba5db0d20fd80452b4ac1f16bc51a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:06 +0100
Subject: [PATCH 150/752] kdecoration: update to 5.20.5

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

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

From 1648548fbeca98ad8ae8a1e9274b8d14b64a137d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:08 +0100
Subject: [PATCH 151/752] kdeplasma-addons5: update to 5.20.5

[ci skip]
---
 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 20ce686c3e7..21eb370b7b5 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.20.4
+version=5.20.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=44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7
+checksum=56c4bba1fa743d675b340014bfd31c546421ff8e09dfd1ef29d45c278eadd7eb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 3b0fa44854a78c69422a87d5909b0ed0e705db83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:11 +0100
Subject: [PATCH 152/752] kgamma5: update to 5.20.5

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

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 92c24503005..581cd204ebe 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41
+checksum=8d765e8f13e7195b0fbd41feee8a1f5a2a605c64141d887c1221f631f5bbc0bf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 1e89fca26aaf76fba045bca5c7a41b2c94790147 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:14 +0100
Subject: [PATCH 153/752] khotkeys: update to 5.20.5

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

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index bfd820e7aff..eff06be31ec 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.20.4
+version=5.20.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=13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648
+checksum=081a132b699b0ce9fa0c05b2e7f2ec7efeea270db5e16a359685e0445bcf88c7
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 3f7afede69939495eea3fd7e8e99b4a39a419d63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:17 +0100
Subject: [PATCH 154/752] kinfocenter: update to 5.20.5

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

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index ec746cf9433..df8658dc9ea 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.20.4
+version=5.20.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"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3
+checksum=55eba3e9f3b64a9508db6a2b4106b243d62d29be2ea08b388bb57297b9db7b4c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From a5e3f377d26b199d323cedde01278b366f038a76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:19 +0100
Subject: [PATCH 155/752] kmenuedit: update to 5.20.5

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

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index d7abd1a7fc0..343b05f8eab 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b
+checksum=eebd0a906538c64b25920a194753102b051f75935743278abef792c3e983f52a

From e36f2813b05ebecfc527db656409c028c7101ab6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:22 +0100
Subject: [PATCH 156/752] kscreen: update to 5.20.5

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

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 3281974325b..edde32d60ed 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.20.4
+version=5.20.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=4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c
+checksum=de08a3ac81e88befd8d62752f8e46a9fbc244f7369c6e3b642cfb4f65a9e52da
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 19dbdea0b9d89ce426e75b46c70bfbff64fe5c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:24 +0100
Subject: [PATCH 157/752] kscreenlocker: update to 5.20.5

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

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index c75ae67da46..c6163e96737 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.20.4
+version=5.20.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"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126
+checksum=802fef234420251eb3f0b50db84f52fe8c5d8859d897ec9ace855d0239a4c01f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 1e011fe57246d67445affe911867a4174044e382 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:27 +0100
Subject: [PATCH 158/752] ksshaskpass: update to 5.20.5

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

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index b56c76f1f6e..31d0dbb8f0b 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ 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=a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218
+checksum=3e135f8e8092bfe9f19dbd6bc12dc052330c4ac8a6a671e835e5e775ab2a65f6

From 130b471a02c0122b9e3b0d82b36ee25b05b4e1d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:29 +0100
Subject: [PATCH 159/752] ksysguard: update to 5.20.5

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

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index 77ce2b5e339..a90faea9b1f 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.20.4
+version=5.20.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, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4
+checksum=32f5227b2c1f91cd64fcee6b401209582cfffb16e2b015c6d6513e9f4d1dab35

From b83770371ef82adf1062ccb2d775f83e99c3f3b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:32 +0100
Subject: [PATCH 160/752] kwallet-pam: update to 5.20.5

[ci skip]
---
 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 2c479cfee6b..51e68d7afd2 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.20.4
+version=5.20.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=0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9
+checksum=53e611baeb02e66ff739045ffb4b913f4e963630baad4cfa96ba77b750fdc1f2

From c7545b476a47e0bd074656308bb66c224273f355 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:35 +0100
Subject: [PATCH 161/752] kwayland-integration: update to 5.20.5

[ci skip]
---
 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 584dbb8b29a..496c264f057 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.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d
+checksum=33f364670a1c19b84fe1bda40e543ebcc9e7593e932a7d18b9815f150ac21f67

From b9cbe8279b3e3111faf13386f1c26338f8f9b4f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:38 +0100
Subject: [PATCH 162/752] kwayland-server: update to 5.20.5

[ci skip]
---
 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 f2502b32822..2f7ab73c006 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.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44
+checksum=e0f36407ba32721936b0b14894480279f60effc088e4e1f3cde6e5c584945d2a
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From be987fa541210f55609f2bcfe1bb1294e3df7584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:45 +0100
Subject: [PATCH 163/752] kwin: update to 5.20.5

[ci skip]
---
 srcpkgs/kwin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 2b72b568886..c9d259f71bf 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.20.4
-revision=2
+version=5.20.5
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a
+checksum=ec142543935a1c9fe9b8e7e73db1bdf58669990d7c1611424062bbdd9e21384e
 
 build_options="pipewire"
 

From 41d50db852a3b2646af8bb768c1674dc88a999dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:47 +0100
Subject: [PATCH 164/752] kwrited: update to 5.20.5

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

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 0a700151de4..7d210310dc2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.20.4
+version=5.20.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=f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2
+checksum=bfb2bb88e6b4e49a69b5c90b4688f3aba3b8e6771221e7c9332293bfc05a1bc0

From 5e97509086a5baeb992df901f413bd4d43059d0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:50 +0100
Subject: [PATCH 165/752] libkscreen: update to 5.20.5

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

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

From 9440515cef457410e6379ff313f3f71326caa9ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:52 +0100
Subject: [PATCH 166/752] libksysguard: update to 5.20.5

[ci skip]
---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 33b643410e2..9bba7c323c4 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -11,7 +11,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=a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422
+checksum=a8a5635c88559567342eba77c707269ab23bc0ce1775ce424c0abd57a83e5d6c
 
 build_options="webengine"
 

From 5f1587706bf3a843b18e0c49ed20f0dbd494922d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:54 +0100
Subject: [PATCH 167/752] milou: update to 5.20.5

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

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 6af13e0da2f..a5cef1ecbc8 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.20.4
+version=5.20.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=123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201
+checksum=704c41b4470e4cd84484406c187bf218c9f89f9c46a1024c6dd19af8856cb7c2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 64e456dcde00a4fa2a18b40bea391458d0281c0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:38:59 +0100
Subject: [PATCH 168/752] oxygen: update to 5.20.5

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

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 47d6d55c976..ef228408cd5 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.20.4
+version=5.20.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=e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67
+checksum=19a74245a6a58f015813b9a7a72cc26622c016975d55bfb548db36d0239ad298

From 635faeaf69365e65482a593695224c2622fc9804 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:02 +0100
Subject: [PATCH 169/752] plasma-browser-integration: update to 5.20.5

[ci skip]
---
 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 26eddace116..18066c95a3f 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.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4
+checksum=c2a665733e09887782ab4235e9e6b3aab2418f3666fd687ab6431546dbafff0f
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 4728eb96b5562a00c1b0c13ff40c823b068eccae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:15 +0100
Subject: [PATCH 170/752] plasma-desktop: update to 5.20.5

[ci skip]
---
 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 824a53f4dd5..40a65b47d58 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.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355
+checksum=bd656e93f44fd528bcd2e0e4c79cbc1adb837369f9a27291bcc5dcd9df2787b9
 replaces="user-manager>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 3709327b81c9528e8460c1fed22e43c69f9f5893 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:17 +0100
Subject: [PATCH 171/752] plasma-disks: update to 5.20.5

[ci skip]
---
 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 56c168f29b9..c2d8eaf11e2 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.20.4
+version=5.20.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=f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845
+checksum=219b542853e569756225b6805f1ae81d305c7aa2be81f722704ff82dde709c2d

From 539be2a13e8352dea0ea5ee4c853e03674065f68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:19 +0100
Subject: [PATCH 172/752] plasma-integration: update to 5.20.5

[ci skip]
---
 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 5a031d8f722..cf42ea48742 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.20.4
+version=5.20.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=4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299
+checksum=a8271e6e61b2e96807ce388c923163352a5e94533355f39edb53389fab95cdf3

From b039dbec41074044cb5a434b6dd28a400fa01eda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:22 +0100
Subject: [PATCH 173/752] plasma-nm: update to 5.20.5

[ci skip]
---
 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 ee30f6ffce5..9ddeb8a4113 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.20.4
+version=5.20.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=7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf
+checksum=468df2bf99907382125a4822322d23c71e1a59f792eba497d89483dc94180e18
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 627a41cec0d1e2d5ba37a03240d7a04b70b9270e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:24 +0100
Subject: [PATCH 174/752] plasma-pa: update to 5.20.5

[ci skip]
---
 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 a53196ace32..5fdb5a311d1 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.20.4
+version=5.20.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=56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3
+checksum=4d84422753aa362383945e8a8a9e6d6fc853f8d918e7b0b7eb1d24317e5e7377
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 23bd6580a2df072fe1858a3a4867c14b1376ba57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:27 +0100
Subject: [PATCH 175/752] plasma-sdk: update to 5.20.5

[ci skip]
---
 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 7ed486b1066..5d82d7cf4a9 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.20.4
+version=5.20.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=49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea
+checksum=de68f253321f2c58b71c0736fbe17e132b7edcc2c86b526c7db8290bc0b1988d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 662d61401efc88f110543e13d9ab2ec157178d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:29 +0100
Subject: [PATCH 176/752] plasma-thunderbolt: update to 5.20.5

[ci skip]
---
 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 2135f733c6e..a5052770017 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.20.4
+version=5.20.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=7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429
+checksum=6013e7b6ffa140f17c128f091d526a561c6e91109da23b3368b1fe62dffd851a
 
 do_check() {
 	: # Requires running dbus and bolt services

From 950597ec0c631e618a87135af34a7b3f53cee423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:31 +0100
Subject: [PATCH 177/752] plasma-vault: update to 5.20.5

[ci skip]
---
 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 f619f1e73ec..f7216f6820b 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.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c
+checksum=a25ab6348e0f5efc28c3bba2a91d5e5553db75305f7eabf17f1a1050fab7322d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d03a8a7586ca06398f45c08fc00f3c94a6804291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:39:55 +0100
Subject: [PATCH 178/752] plasma-workspace-wallpapers: update to 5.20.5

[ci skip]
---
 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 a512dce504f..6c4f2171fa5 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.20.4
+version=5.20.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=4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808
+checksum=e39bda4d2807c83063b980008e8d9f14add71bc5fa1ddbc059754ea416bbe70f

From 3a768fafefcbd3f8360bbb2a21bfc4826aece718 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:40:02 +0100
Subject: [PATCH 179/752] plasma-workspace: update to 5.20.5

[ci skip]
---
 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 6a07fc4dc5b..375258c9cf3 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.20.4
+version=5.20.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9
+checksum=357ef43092efb4d45f7c6ae9249a538be3484c855d0e35ae3b0b1e8d3db6c624
 
 build_options="pipewire"
 

From aa374adc8ae75a39cc9d480b850a9e6ad4492147 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:40:04 +0100
Subject: [PATCH 180/752] polkit-kde-agent: update to 5.20.5

[ci skip]
---
 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 55dcf379026..ec8def557ca 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.20.4
+version=5.20.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=f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61
+checksum=5ba485c5db38815961ba8737ece74908d9b9a35229f1cd8c7a7df79122b37be6

From 72fa8d09042eb4cbf85085d299a3923074bd08e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:40:06 +0100
Subject: [PATCH 181/752] powerdevil: update to 5.20.5

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

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index f01b9728636..3a05f064e26 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.20.4
+version=5.20.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=864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d
+checksum=32fb5ca72bed38d9bffc47f24a6c4dcee03b1da52b200d0f5bb976f9d48b6ef0

From 3ae3de3f329af9f46a2b8aa46077c7071bf37a91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:40:08 +0100
Subject: [PATCH 182/752] sddm-kcm: update to 5.20.5

[ci skip]
---
 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 64561a06523..79cc9b59172 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.20.4
+version=5.20.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=c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e
+checksum=5f850e3e3e7dc85f5b13444c6669caf47690bf8e85d4248a4304f56ca7f189ff

From a0ff764775ce6e48d95e528df7767b1db0f570a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:40:11 +0100
Subject: [PATCH 183/752] systemsettings: update to 5.20.5

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

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3eb0f610104..fb0cfecb0fe 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.20.4
+version=5.20.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"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version%.1}/${pkgname}-${version}.tar.xz"
-checksum=e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9
+checksum=b2e03bc39a1c7f4e298c8c196a22e22291a5b71ecd972234c6a47d9b284c32ac

From b4ee86f8d4292ae3427b552fd795781bfff9dc8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:40:13 +0100
Subject: [PATCH 184/752] xdg-desktop-portal-kde: update to 5.20.5

[ci skip]
---
 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 1530310f7cd..4ebbad50f67 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.20.4
+version=5.20.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=cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8
+checksum=f40d5453c30a5761310408513b57d3a7b9cb5f172e163094ca2aa17b4201e71d

From 6c7d2f77a5fb68244f835b4c8dfa9096f05ea476 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 13:41:23 +0100
Subject: [PATCH 185/752] Rocket.Chat-Desktop: update to 3.1.1.

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

diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index e18e1521ebf..628f1aaa373 100644
--- a/srcpkgs/Rocket.Chat-Desktop/template
+++ b/srcpkgs/Rocket.Chat-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Rocket.Chat-Desktop'
 pkgname=Rocket.Chat-Desktop
-version=3.0.6
+version=3.1.1
 revision=1
 _electron_ver=10
 wrksrc="Rocket.Chat.Electron-${version}"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://rocket.chat/"
 distfiles="https://github.com/RocketChat/Rocket.Chat.Electron/archive/${version}.tar.gz"
-checksum=1b00f280df130291c79f3a2e32af7e808fa1efbcaa1a49ce4f6a11370cba101c
+checksum=ba0f4ebee4119987ab45a304b9ee3bfc8ce14159dd9cd3dca095020e1eae8a3e
 
 export USE_SYSTEM_APP_BUILDER=true
 

From b11673f4587fea819e4ddac8584d5fce1829aae7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 14:03:50 +0100
Subject: [PATCH 186/752] kiwix-lib: update to 9.4.1.

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

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index 543a066b93f..fed972c83bc 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
-version=9.4.0
+version=9.4.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
 distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
-checksum=ccc883d06f111ebcb7f3530299798501b97400f319814871e17f73fa3e349766
+checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
 	makedepends+=" libatomic-devel"

From 2c1fa51324ee0fcdd999b1b3a2d100b31c76d3c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 14:04:44 +0100
Subject: [PATCH 187/752] libzim: update to 6.3.0.

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

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index e77332b0fce..fe3c5310980 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,6 +1,6 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=6.2.2
+version=6.3.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.openzim.org/wiki/OpenZIM"
 changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog"
 distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz"
-checksum=6619035d35c9ba057c80be5758fa86922802c74aca40e5fffd40b77f0f263af2
+checksum=984d2f3881c507c9f0212dc2bc1b808d25cdeef6a62043f9211fcb78a231a986
 replaces="libzim-tools>=0"
 
 build_options="xapian zlib zstd"

From 2a832a78f8b3578db8e53fd3f9d197395d6d4c75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 14:06:31 +0100
Subject: [PATCH 188/752] spdlog: update to 1.8.2.

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

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 30d2d860d48..2a8e1c9e8f1 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,16 +1,21 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.0
-revision=2
+version=1.8.2
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON"
+hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="John <me@johnnynator.dev>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=1e68e9b40cf63bb022a4b18cdc1c9d88eb5d97e4fd64fa981950a9cacf57a4bf
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+fi
 
 post_install() {
 	vlicense LICENSE

From 6a68e9accf340e96df8ee801ed717124a71badf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 14:12:09 +0100
Subject: [PATCH 189/752] range-v3: update to 0.11.0.

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

diff --git a/srcpkgs/range-v3/template b/srcpkgs/range-v3/template
index b3f04fd0b59..b845742ae25 100644
--- a/srcpkgs/range-v3/template
+++ b/srcpkgs/range-v3/template
@@ -1,6 +1,6 @@
 # Template file for 'range-v3'
 pkgname=range-v3
-version=0.10.0
+version=0.11.0
 revision=1
 build_style=cmake
 configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
@@ -10,14 +10,12 @@ maintainer="John <me@johnnynator.dev>"
 license="BSL-1.0"
 homepage="https://github.com/ericniebler/range-v3"
 distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz"
-checksum=5a1cd44e7315d0e8dcb1eee4df6802221456a9d1dbeac53da02ac7bd4ea150cd
+checksum=376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON
-	 -DDRANGE_V3_PERF=ON"
+	configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON"
 else
-	configure_args+=" -DRANGE_V3_HEADER_CHECKS=OFF -DRANGE_V3_TESTS=OFF
-	 -DDRANGE_V3_PERF=OFF"
+	configure_args+=" -DRANGE_V3_HEADER_CHECKS=OFF -DRANGE_V3_TESTS=OFF"
 fi
 
 pre_configure() {

From c8adaa3069abee4776009c7cdffc9f3254958c1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 14:17:50 +0100
Subject: [PATCH 190/752] yadm: update to 3.0.0.

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

diff --git a/srcpkgs/yadm/template b/srcpkgs/yadm/template
index 26750123694..6e6a77ed547 100644
--- a/srcpkgs/yadm/template
+++ b/srcpkgs/yadm/template
@@ -1,19 +1,19 @@
 # Template file for 'yadm'
 pkgname=yadm
-version=2.5.0
-revision=2
+version=3.0.0
+revision=1
 depends="bash git gnupg"
 short_desc="Yet Another Dotfiles Manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://yadm.io/"
 distfiles="https://github.com/TheLocehiliosan/${pkgname}/archive/${version}.tar.gz"
-checksum=d022d118a1a477e09afa00c80e10bd94b150d99709e57f01ba48ca2eaaeeb2de
+checksum=af968c815817e9de85b60dc9c9a7e6159ed34e4f91ea78cadbcd6c73a0301c06
 
 do_install() {
 	vbin ${pkgname}
 	vman ${pkgname}.1
-	vcompletion completion/yadm.bash_completion bash
-	vcompletion completion/yadm.fish_completion fish
-	vcompletion completion/yadm.zsh_completion zsh
+	vcompletion completion/bash/yadm bash
+	vcompletion completion/fish/yadm.fish fish
+	vcompletion completion/zsh/_yadm zsh
 }

From 365c3c9a433e52f483194ae24e375d8ed930630c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 14:32:06 +0100
Subject: [PATCH 191/752] tellico: update to 3.3.4.

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

diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 56dcdc76ef8..d20e33769d9 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,6 +1,6 @@
 # Template file for 'tellico'
 pkgname=tellico
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=cmake
 configure_args="-DENABLE_WEBCAM=$(vopt_if webcam ON OFF)"
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://tellico-project.org/"
 distfiles="http://tellico-project.org/files/${pkgname}-${version}.tar.xz"
-checksum=f5c75b5136b632ddffc8dca53927468e00c44c3ef8b11d1d5380b9f2e5b463aa
+checksum=716310760aa41b5673ffe8f239bf0a7835ca8030773499bf690de21c470e0187
 python_version=3
 build_options="webcam yaz xmp cdio cddb scanner"
 build_options_default="webcam yaz xmp cdio cddb scanner"

From 3f96e717a0bb19103f97090d4ec88b2a909ce142 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jan 2021 09:35:15 -0500
Subject: [PATCH 192/752] python3-prompt_toolkit: update to 3.0.9.

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

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 04e7f216796..b76f908cca1 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.8
+version=3.0.9
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -12,13 +12,9 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c
+checksum=c5eeab58dd31b541442825d7870777f2a2f764eb5fda03334d5219cd84b9722f
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
-do_check() {
-	python3 -m pytest
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 72615a9a8148ed8b7de8309be895927f537879fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jan 2021 10:33:35 -0500
Subject: [PATCH 193/752] removed-packages: add python-matplotlib

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e0f6a5c17b8..ff1327d3238 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=2
+revision=3
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -60,6 +60,8 @@ replaces="
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
  python-jellyfish<=0.6.1_2
+ python-matplotlib<=2.2.4_2
+ python-matplotlib-data<=2.2.4_2
  python-pivy<=0.6.4_2
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7

From 199541ce7c2050665c75d88582b5a1e924dfe75b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 20 Sep 2020 18:38:07 +1000
Subject: [PATCH 194/752] python3-numpy: update to 1.19.5, fix armv5tel-musl

In fenv.h, musl disables the normal set of constants that you would get
on arm with an arm device with an fpu (armv6 and up), but armv5tel on
void uses softfloat all the time. But python3-numpy dosen't use these to
interact with the fpu (the compiler would generate those instructions)
and rather just uses those constants for a generic GCC implementation.
So we give them out anyway.

Co-authored-by: fosslinux <fosslinux@aussies.space>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>
---
 srcpkgs/python3-numpy/files/fenv-constants.h  | 10 ++++++++++
 .../python3-numpy/files/fenv-constants.patch  | 11 ++++++++++
 srcpkgs/python3-numpy/template                | 20 +++++++++++++++----
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-numpy/files/fenv-constants.h
 create mode 100644 srcpkgs/python3-numpy/files/fenv-constants.patch

diff --git a/srcpkgs/python3-numpy/files/fenv-constants.h b/srcpkgs/python3-numpy/files/fenv-constants.h
new file mode 100644
index 00000000000..c2c21d2bb23
--- /dev/null
+++ b/srcpkgs/python3-numpy/files/fenv-constants.h
@@ -0,0 +1,10 @@
+#define FE_INVALID    1
+#define FE_DIVBYZERO  2
+#define FE_OVERFLOW   4
+#define FE_UNDERFLOW  8
+#define FE_INEXACT    16
+#define FE_ALL_EXCEPT 31
+#define FE_TONEAREST  0
+#define FE_DOWNWARD   0x800000
+#define FE_UPWARD     0x400000
+#define FE_TOWARDZERO 0xc00000
diff --git a/srcpkgs/python3-numpy/files/fenv-constants.patch b/srcpkgs/python3-numpy/files/fenv-constants.patch
new file mode 100644
index 00000000000..987ad4e346f
--- /dev/null
+++ b/srcpkgs/python3-numpy/files/fenv-constants.patch
@@ -0,0 +1,11 @@
+--- numpy/core/src/npymath/ieee754.c.src	2020-09-20 14:53:51.998825328 +1000
++++ numpy/core/src/npymath/ieee754.c.src	2020-09-20 14:54:03.611889518 +1000
+@@ -8,6 +8,8 @@
+ #include "npy_math_private.h"
+ #include "numpy/utils.h"
+ 
++#include "fenv-constants.h"
++
+ #ifndef HAVE_COPYSIGN
+ double npy_copysign(double x, double y)
+ {
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index e54a96772e0..619040f2892 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,23 +1,35 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.19.4
+version=1.19.5
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
 makedepends="python3-devel lapack-devel cblas-devel"
 depends="python3-setuptools"
-checkdepends="python3-pytest python3-hypothesis"
 short_desc="Fast and sophisticated array facility to Python3"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6082884371a5998fa8b006b506f4827c0617d789d7b3ee78549bb044139a9a8e
+checksum=43fe3bcdf27a2eb27196a1d140385aeece71c8b1a6eda18d2c6365239e50c60f
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
+post_patch() {
+	case "${XBPS_TARGET_MACHINE}" in
+		armv5tel-musl)
+			cp "${FILESDIR}/fenv-constants.h" numpy/core/src/npymath/
+			patch -Np0 -i "${FILESDIR}/fenv-constants.patch"
+			;;
+	esac
+}
+
+pre_build() {
+	make_build_args+=" ${makejobs}"
+}
+
 do_check() {
-	./runtests.py -v
+	echo "Skipping check: tests do not function properly in builddir"
 }
 
 post_install() {

From dc3c9cfda0a7ccc012a97f33426daddc9aea123f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 20 Sep 2020 18:39:51 +1000
Subject: [PATCH 195/752] python-numpy: fix armv5tel-musl.

Uses the same patch and file from python3-numpy so we just use that from
python3-numpy's files directory.

Closes: #24988 [via git-merge-pr]
---
 srcpkgs/python-numpy/files/fenv-constants.h     | 10 ++++++++++
 srcpkgs/python-numpy/files/fenv-constants.patch | 11 +++++++++++
 srcpkgs/python-numpy/template                   | 14 +++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-numpy/files/fenv-constants.h
 create mode 100644 srcpkgs/python-numpy/files/fenv-constants.patch

diff --git a/srcpkgs/python-numpy/files/fenv-constants.h b/srcpkgs/python-numpy/files/fenv-constants.h
new file mode 100644
index 00000000000..c2c21d2bb23
--- /dev/null
+++ b/srcpkgs/python-numpy/files/fenv-constants.h
@@ -0,0 +1,10 @@
+#define FE_INVALID    1
+#define FE_DIVBYZERO  2
+#define FE_OVERFLOW   4
+#define FE_UNDERFLOW  8
+#define FE_INEXACT    16
+#define FE_ALL_EXCEPT 31
+#define FE_TONEAREST  0
+#define FE_DOWNWARD   0x800000
+#define FE_UPWARD     0x400000
+#define FE_TOWARDZERO 0xc00000
diff --git a/srcpkgs/python-numpy/files/fenv-constants.patch b/srcpkgs/python-numpy/files/fenv-constants.patch
new file mode 100644
index 00000000000..987ad4e346f
--- /dev/null
+++ b/srcpkgs/python-numpy/files/fenv-constants.patch
@@ -0,0 +1,11 @@
+--- numpy/core/src/npymath/ieee754.c.src	2020-09-20 14:53:51.998825328 +1000
++++ numpy/core/src/npymath/ieee754.c.src	2020-09-20 14:54:03.611889518 +1000
+@@ -8,6 +8,8 @@
+ #include "npy_math_private.h"
+ #include "numpy/utils.h"
+ 
++#include "fenv-constants.h"
++
+ #ifndef HAVE_COPYSIGN
+ double npy_copysign(double x, double y)
+ {
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index 52308fd2aa6..2d1a1a99f24 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -4,7 +4,6 @@ version=1.16.5
 revision=1
 wrksrc="numpy-${version}"
 build_style=python2-module
-pycompile_module="numpy"
 hostmakedepends="python-setuptools python-Cython gcc-fortran"
 makedepends="python-devel lapack-devel cblas-devel"
 short_desc="Fast and sophisticated array facility to Python2"
@@ -15,6 +14,19 @@ distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
 checksum=3c82a9b8616e3096a79a2af9c288d8ed4013a10fc7baf3eaf54655309734dadd
 alternatives="numpy:f2py:/usr/bin/f2py2"
 
+post_patch() {
+	case "${XBPS_TARGET_MACHINE}" in
+		armv5tel-musl)
+			cp "${FILESDIR}/fenv-constants.h" numpy/core/src/npymath/
+			patch -Np0 -i "${FILESDIR}/fenv-constants.patch"
+			;;
+	esac
+}
+
+pre_build() {
+	make_build_args+=" ${makejobs}"
+}
+
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py2_inc}

From 2b4f0d20da60ab9411fa46d11144b6da0b3891b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jan 2021 10:52:12 -0500
Subject: [PATCH 196/752] qhull: update to 2020.2.

Closes: #27082.
---
 common/shlibs          |  5 ++---
 srcpkgs/qhull/template | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index aa697549809..a60e1becef3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,9 +2121,8 @@ libwvstreams.so.4.6 wvstreams-4.6.1_1
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1
-libqhull_p.so.7 libqhull-2015.2_1
-libqhull_r.so.7 libqhull-2015.2_1
-libqhull.so.7 libqhull-2015.2_1
+libqhull_r.so.8.0 libqhull-2020.2_1
+libqhull.so.8.0 libqhull-2020.2_1
 libKF5NetworkManagerQt.so.6 networkmanager-qt5-5.26.0_1
 libfcitx-core.so.0 libfcitx-4.2.8_1
 libfcitx-gclient.so.1 libfcitx-4.2.9.5_1
diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 05f15ef7d21..949d21450a0 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,19 +1,27 @@
 # Template file for 'qhull'
 pkgname=qhull
-version=2019.1
+version=2020.2
 revision=1
 build_style=cmake
+make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="BSD"
+license="Qhull"
 homepage="http://www.qhull.org"
+changelog="http://www.qhull.org/src/Changes.txt"
 distfiles="https://github.com/qhull/qhull/archive/$version.tar.gz"
-checksum=cf7235b76244595a86b9407b906e3259502b744528318f2178155e5899d6cf9f
+checksum=59356b229b768e6e2b09a701448bfa222c37b797a84f87f864f97462d8dbc7c5
 
 post_install() {
+	vlicense COPYING.txt
+
+	# Manually install libqhull which the package author has deprecated,
+	# but octave and matplotlib still require.
+	cp -r ${wrksrc}/build/libqhull.so* ${DESTDIR}/usr/lib
+
 	install -Dm644 ${FILESDIR}/qhull.pc ${DESTDIR}/usr/lib/pkgconfig/qhull.pc
 	sed -i "s|@VERSION@|${version}|" ${DESTDIR}/usr/lib/pkgconfig/qhull.pc
-	# convenience links for backwards compatibility
+	# convenience links for backwards compatibility (required by at least octave)
 	ln -sf libqhull ${DESTDIR}/usr/include/qhull
 	ln -sf libqhull.h ${DESTDIR}/usr/include/qhull/qhull.h
 }

From b13cf60161ad409ae4d8e8c6baa6b03100fab1db Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:30:41 +0100
Subject: [PATCH 197/752] libgdal: revbump for qhull

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

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

From 028ffeec26016598ba158d98c8fe7548e08db01a Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:30:41 +0100
Subject: [PATCH 198/752] octave: revbump for qhull

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

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 1ca9e663229..faac10a9818 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,7 +1,7 @@
 # Template file for 'octave'
 pkgname=octave
 version=5.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" --with-blas=openblas --with-lapack=openblas"
 hostmakedepends="perl gcc-fortran pkg-config gnuplot"

From 3bdf5e109c7e564a5ebdd35d5539d47b5392fb0e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 10 Dec 2020 20:30:41 +0100
Subject: [PATCH 199/752] python3-matplotlib: revbump for qhull

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

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 3940b55d0f9..189cc2ac711 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
 version=3.3.3
-revision=1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -25,6 +25,10 @@ pre_build() {
 	EOF
 }
 
+do_check() {
+	echo "Skipping check: comparison of images is too frail for validation"
+}
+
 post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 	vlicense LICENSE/LICENSE

From c506ba1ca8bca0d6bdc062dfc56fb7dd70c50677 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Jan 2021 19:18:39 +0100
Subject: [PATCH 200/752] syncthing: update to 1.12.1.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 41c31cdbe8c..8c9dc67fbfe 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.12.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -18,7 +18,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=38782a448868a4bcbb4b9761b467e3c059b4b0f9896b432090526940f28117c7
+checksum=5751365374e03c32f731aeb1d07f7df0984eca30e14878d636b91cd35f0db1c3
 
 pre_build() {
 	GOARCH= go generate \

From 96c4771117a2f18b0c3846af3228cb7eafa30125 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 28 Dec 2020 20:50:04 -0600
Subject: [PATCH 201/752] libupnp1.8: update to 1.8.7.

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

diff --git a/srcpkgs/libupnp1.8/template b/srcpkgs/libupnp1.8/template
index 736d77045c6..7ae8ba2f1d4 100644
--- a/srcpkgs/libupnp1.8/template
+++ b/srcpkgs/libupnp1.8/template
@@ -1,17 +1,17 @@
 # Template file for 'libupnp1.8'
 pkgname=libupnp1.8
-version=1.8.4
+version=1.8.7
 revision=1
 wrksrc="pupnp-release-${version}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-reuseaddr"
-hostmakedepends="automake libtool"
-short_desc="A Portable Open Source UPnP Development Kit"
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-3-Clause"
 homepage="http://pupnp.sourceforge.net/"
 distfiles="https://github.com/mrjimenez/pupnp/archive/release-${version}.tar.gz"
-checksum=976c3e4555604cdd8391ed2f359c08c9dead3b6bf131c24ce78e64d6669af2ed
+checksum=236a788a0fe1274f51497c0433398ab2fd8ecf3ed8a6e738b15896f63e89c81d
 
 # libupnp uses large file support, so users must do that, too
 CFLAGS="-D_FILE_OFFSET_BITS=64"

From 1d2eb21c7723ccbe6fa877354107c03417ebbde3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 6 Jan 2021 20:16:47 +0100
Subject: [PATCH 202/752] colord: remove bad ldflags hack

this was previously fixed with other stuff
---
 srcpkgs/colord/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 24b19c33b9e..98739d4802b 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -32,10 +32,6 @@ fi
 build_options="gir vala"
 build_options_default="gir vala"
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc-musl) LDFLAGS+=" -lssp_nonshared" ;;
-esac
-
 do_check() {
 	# assertion failed (cd_edid_get_vendor_name (edid) == "LG"): (NULL == "LG")
 	:

From ee6f1760526968364112a7cc643592dc600089b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 31 Dec 2020 15:49:51 +0100
Subject: [PATCH 203/752] shutils/show.sh: never show self deps for depends

xbps-src always ignore self deps in depends and in hostmakedepends
when not cross compiling. The old behaviour did only check for cross.
This now also ignores them in makedepends, but they are either way
disallowed in there, and returning an error would be correct, but
./xbps-src show-* is and never was suitable for linting, so ignore for now.
---
 common/xbps-src/shutils/show.sh | 57 ++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/common/xbps-src/shutils/show.sh b/common/xbps-src/shutils/show.sh
index 2f545ce6474..e2f50f618ad 100644
--- a/common/xbps-src/shutils/show.sh
+++ b/common/xbps-src/shutils/show.sh
@@ -76,48 +76,59 @@ show_avail() {
     check_pkg_arch "$XBPS_CROSS_BUILD" 2>/dev/null
 }
 
+show_eval_dep() {
+    local f x _pkgname _srcpkg found
+    local _dep="$1"
+    local _host="$2"
+    if [ -z "$CROSS_BUILD" ] || [ -z "$_host" ]; then
+        # ignore dependency on itself
+        [[ $_dep == $sourcepkg ]] && return
+    fi
+    if [ ! -f $XBPS_SRCPKGDIR/$_dep/template ]; then
+        msg_error "$pkgver: dependency '$_dep' does not exist!\n"
+    fi
+    # ignore virtual dependencies
+    [[ ${_dep%\?*} != ${_dep#*\?} ]] && _dep=${_dep#*\?}
+    unset found
+    # check for subpkgs
+    for x in ${subpackages}; do
+        [[ $_dep == $x ]] && found=1 && break
+    done
+    [[ $found ]] && return
+    _pkgname=${_dep/-32bit}
+    _srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
+    _srcpkg=${_srcpkg##*/}
+    echo $_srcpkg
+}
+
 show_pkg_build_depends() {
-    local f x _pkgname _srcpkg found result
+    local f result
     local _deps="$1"
+    local _hostdeps="$2"
 
     result=$(mktemp) || exit 1
 
     # build time deps
     for f in ${_deps}; do
-        if [ -z "$CROSS_BUILD" ]; then
-            # ignore dependency on itself
-            [[ $f == $sourcepkg ]] && continue
-        fi
-        if [ ! -f $XBPS_SRCPKGDIR/$f/template ]; then
-            msg_error "$pkgver: dependency '$f' does not exist!\n"
-        fi
-        # ignore virtual dependencies
-        [[ ${f%\?*} != ${f#*\?} ]] && f=${f#*\?}
-        unset found
-        # check for subpkgs
-        for x in ${subpackages}; do
-            [[ $f == $x ]] && found=1 && break
-        done
-        [[ $found ]] && continue
-        _pkgname=${f/-32bit}
-        _srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
-        _srcpkg=${_srcpkg##*/}
-        echo "${_srcpkg}" >> $result
+        show_eval_dep $f "" >> $result
+    done
+    for f in ${_hostdeps}; do
+        show_eval_dep $f "hostdep" >> $result
     done
     sort -u $result
     rm -f $result
 }
 
 show_pkg_build_deps() {
-    show_pkg_build_depends "${hostmakedepends} ${makedepends} $(setup_pkg_depends '' 1 1)"
+    show_pkg_build_depends "${makedepends} $(setup_pkg_depends '' 1 1)" "${hostmakedepends}"
 }
 
 show_pkg_hostmakedepends() {
-    show_pkg_build_depends "${hostmakedepends}"
+    show_pkg_build_depends "" "${hostmakedepends}"
 }
 
 show_pkg_makedepends() {
-    show_pkg_build_depends "${makedepends}"
+    show_pkg_build_depends "${makedepends}" ""
 }
 
 show_pkg_build_options() {

From ffff90c122b1c9c166c3978672111d20d9821ae9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Jan 2021 15:58:25 -0600
Subject: [PATCH 204/752] lutris: add missing dependencies

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

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index b43458c3d0a..6a059013032 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,12 +1,12 @@
 # Template file for 'lutris'
 pkgname=lutris
 version=0.5.8.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
  pciutils cabextract gtk+3 xrandr unzip p7zip gnome-desktop python3-requests webkit2gtk
- glxinfo"
+ glxinfo python3-distro python3-lxml"
 short_desc="Open gaming platform for managing games in a unified way"
 maintainer="Jan Wey. <janwey.git@gmail.com>"
 license="GPL-3.0-or-later"

From 9ca92dc67c5591fd64e5bb25b104e72aaf74da8f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jan 2021 18:20:02 +0100
Subject: [PATCH 205/752] linux5.10: update to 5.10.5.

---
 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 422148336ca..036afe14b15 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.4
+version=5.10.5
 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=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+checksum=3991a9e16a187d78d5f414d89236ae5d7f404a69e60c4c42a9d262ee19612ef4
 python_version=3
 patch_args="-Np1"
 

From 3a1c6321567527a0060f2e7d78d6326984f489f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 6 Jan 2021 23:49:41 +0100
Subject: [PATCH 206/752] firefox-esr: update to 78.6.1

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

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 65c5630c7ad..b2670ec4c78 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.6.0
+version=78.6.1
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=5e69f9bfd1a35decdae8d4b28da8100820e58b429f539fa9884802347631cf53
+checksum=0d07b74cb66b94018e3d7f11531f95c76a955e0016a3c401241d0d85062ae7ce
 lib32disabled=yes
 conflicts="firefox>=0"
 

From b5a3ffe47cac199e1a757f8fe74bca996e930a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 6 Jan 2021 23:49:49 +0100
Subject: [PATCH 207/752] firefox-esr-i18n: update to 78.6.1

---
 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 54664e6cdba..36c781fe3d2 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.6.0
+version=78.6.1
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="a3e43f54ec51d19899d4feb4ccb3a5387fbef2b3a3ea7d20d7aa1b06964697e4
-9ed973eec0c9966e380825e89530da3a8a51f9c358a98e446c09c47e1f6de571
-7168e456d96cf18c4fb3a6905ff2b89ede0aa963a4cce0d1d7d9c8b9a2b7bf9d
-33ff2cc2db9a8219365f216985a03e96c04fc89fb017d670ac4beb19819bd780
-21d1a960e87ae3925181163bf0cf6c86726bfa0a3261b6d9ab2b0456337423b1
-3c372e2920c3af8e037fd9092b0092b093b550839cc3f0a26d3002f6468f3366
-841faec16c73cebc1daa547f491c17d288252abf3845381cd2a793bb22b6d4a9
-4df42214ec12a5bd38b190fe6ef85b33bd29bc20d2d0212778f340d1917d303d
-d33fa569b89cbe17009ca2c2895434586cef29dd468095b964c91e64140f51f2
-ee8c5e0dce2c7069e93c17bc4ebf83f617db20a0df2ce77cb28325aaacbddae0
-4f989b2fd58bebfa0c40a3d5622138e08c850e18a9c354803521e98acc751fca
-d24de8b52821e3cd1fb60c2dd4ac201e2b49a6ee8636b2c467095837730d3a9a
-434eac4f1d4d0c867f3bff57ca79108231d598a86c7c57daaceb4e37c1058fd7
-b5ebd3da35db36612124a312736e136587270ba7dbcf6192b3f0769d4750af94
-6aa88275764e07326df66388ae04d6a5d22a56616688d73a88e9be6471f04a97
-ff44ab341954a02b1fc3f1e69935a297b511bee9c26b7c84ec6659b4c1e73d96
-d67aaf6030d29f3c5434c03b6946da6a3ab21c9593bd3b9a573a1e32b6dbe78e
-ce3deddf4f8ecf1bc7337a988dd2d5f283232018e593a924053bb9ef110092a7
-b11b4f9666a353ff20ede8f2faf4135ae2fa76306ed46f946153afc5fa8af48c
-a62d8dcfd643e543beb8aa7e6c5dec51818e92e447e1e19756b2200e3b50ada2
-ed00efd2b735d452f68b1a96395f665b4767fbb55e23964cfc3d9bf78f63d842
-5377afb63531f83cdb583f9c3911c81f4e665e6d85a486e7f2b47907234d6e7f
-53cdf61463e538cd977da8ecd066565012193f97dba62006042bcca3a2e88a9f
-fd8f5915e2358edea4430cfdf0622472faa8fb67ef3877067a2ae67a29882626
-d7fa597cc90782ff00164fad996ceb4ed634f764d1f9682bb5546c12bd8b0422
-710f029f000e8a994b18649e5c409424434e237c26c8387ca74c7bbd213a404a
-54a65d42dbb25273aa979962f38f9af8d340cf3e01c1be2ff3689be80dda51c4
-f278700d3ea60a7b0829796f647bbc8e5812df112f20007fed4be33948030ba7
-3a8ed12ed02a32cd1ac113bb5bddec3d2c43efe3ddcf9e326ec9c61b05e6d473
-5fc6aa7af74d26e8df28cac9ff8dfcfad59f67fd9063821aa4407976921982ae
-e16a5c1d68c74528600468d062075b3956cff34d75ad36463a515d10a89eed62
-1bf4a6f0dc993bfee0d2bb1888a09782e5e4ddf03faa6d058d9ab1765fc59910
-2f8b08959c6067f41ce371fcee17d3ad974dad403efc147d7b7db2b0aae95403
-d625b765f1d6c788bab2342a989253fe0a5b45de2f05b6a591ee98388238874b
-847019e988185037e0c080ea415585477104ec2fa4a834d526510be9c02b2f46
-bd81843808dbc4a1706c28c8b7854ad81eb326593217f8e94ea04bc525677a71
-85d07bd18705998296d9361fcf1f58f4b8635abef4862e052fa0587d9a618c39
-803b3c782263d7bedee91a4630a4e11aaaa141f8b5a68f9789e75fa22d716a35
-ba4fa0bd4a32d7a115d4af3b036cb4bdb7172933cda7c8af6ef0ff2e63cf35db
-d0ca3a6ea17678869d2bf45fe3a49796417d7142feca868bb04148694053aba3
-784ecdfc7586e537ecb9157013b9588107a594c73c9ab7a2efea168b8fe4c3ec
-533378fb5e833640e76aae8675b0ccbb2ff8133a410aec190ffde7d6d1a42697
-1509e3c4d8ec89264a65f3c53c7dbe04c486e81be8036bb72d4691b33493a6db
-3dbef9d02f9e605e918c97d6c48b8e45480029a85fb0e6d00b878879ede2be94
-74a84cd5ba9cb73c0a72a9e51d0c91f423df088e4ad52004373eeaf7dd42c331
-fda6b4a45a597265fcc6e391ce6d55e655509a43058ff4025dcc9b3f6b0d9137
-de825ba828c8e2e90263e1cc4a73cdfe4e54832579bb02e11e76a38d44a7dfd0
-ed69ce1a92eb762fb32894e994ce548791dd1934656c3ac11f52113def01a4f5
-689844ead00bb209d8abb432d1056009eb423b62f8b56775fc3f0de5abbb2b90
-ca26fba06970275828fe6ba9f159b6558970bc32bd4b10550c34ca8f828fe9a4
-1c58b04e71a907b04556fe2fd636cc2dccd06c1637ed873e0b887a5d9b59c115
-a2810dc27b76127ed2697960f6e672302ff3b68ba4affcf06e054f970d48b54f
-2103cdbcb3dc28830b733ac46617c8ed648933e05e15c552dc37fa41333438f1
-90b5f4353129924b303f2bbd45c928ca1a6eabb76a4f50ecad1140192ce3b0c4
-4e7abb1d5d256406cf53a86f0e9aeb59297f9522037d2d6ec4ad5ac0769a6c12
-4e53b2ba6509ebce94ce67d754f19159c25d9840b2311bcbe529c1b0a917d203
-317d721a66dfc17b1882e9e70cc1ae07923a26db2386d38020cbb37cb010edaa
-9428a46cef383ea016c281e161364d1d3cf16e9e7b3dbc50edb31f9581abfb44
-b11ae615fb9979d3142ce1008249f7d4d27570e6df83afa4424176752cb4b8f7
-a746a3b3ca79fbb6a03facea73072fa4a7373f3079fb2040819ce6677ccae49f
-7347d008b3bba025df28d9fc605959371f8890616540baa85fd3a3ab8803f188
-a607b18988b9c31e39db377822b393f4b9273d5a243db291c1f7529f953663d2
-36b659a0d32468db08e7ba34df1556921f47f4289b95c17a084987152d15fc21
-3d420bb000b089a542ef2479e70f5aa07675351619e101a8d9a0f4c000c530ed
-90ec843a41603989135fa7662946c119231ae896a336eae04c84375a21a37f9e
-d2043e17d23a137a03543724b122912c8c324405453bda841186dc8310da3e30
-47ad1912e18d316f8022d59068525dcca390346c5577721832092dd1f504378d
-93e8358fcd669925e658c3bcc89a2936f6766c5c50f45724a22dbf1707321594
-4b7de607611c712ab36bad61389d2afe4e216a2762bff6cf9a4485e5970e4b66
-8ab69866984e6bb0b6ca21cdbdcb1eb8b05290e55072678ce0307e9d487a0e52
-dfa64a5268bb993c30d00e3bd385d8e906c6a6ad04f5b974a8d1272e1cf63e52
-107b2e4a22afecf826d91ca9a1f4179aa291c63a82e65ce243bfdac54489daaf
-c7589c6e36d66a479fc27151ec01b9bddabc21ba901c3e4ac936efd6ed6fed71
-f7abb7cbae9e6ac27b1a748e5ca4cac5bc65dd88047d9660b0c121a8f45f8435
-5f4933672b7aaf14869466c68d9806ae154be1aa3d1f8f8dcaba8c81bc790016
-f8c641cedfcdd0579b617c7f43c4ef78bf75e8933533abc4db70f7e9022555c2
-d6c652d3744d94f049c6051483503704646aaf075503dc0b962930f2d79a4197
-1d6c87c0f53eee8ebb91f8aa4d82c50cc222d69b032cb9866a9cf5c7b1ce793d
-ffec726370863fc6de7e31e9693f183f9ad0e8ed9e50791d05050852dca93932
-42f3750989959315846cfb22de86b367f7eb415fbf821efdd136c0de707286d8
-5e0afee5d9de869c630bc4c0333f5f22c7179d714734d11349b9e4f276edc82d
-2a561aaf5e03284ba1400595bc83f37102f529b98955910dd555283e49ce8aab
-c1c7b715352b3fc4b84854d337d765199831d5040add97f0798e39fc8a0d0de7
-f2f975bc886badc4cfae06a0d14af1ac7c3f588e82e9e76ff7303006f742fc18
-c75e93264b2ce5ffcf278fd4c158238bb327704b43a361047ffd58f718d1172b
-1813f566a3ffe23539cbb535c3a3652734d71be4be6ee229f6b4e87361d88e55
-1e69b65eb0ade8c858b4873079de15d9717e150b40f330a2bf575c710da60a66
-b9b22c7f4b0b58fc3a57b568a3859f89a1d9b049a8d9a559d9f3f5e83fe1e119
-22129505ca5c2f4c590776992b05dadf12eac61ad47ea2279a2d760a520b3404
-778b71152761b415a887f2b9ffd7b111073c38fa32e2db406a98ac541934edc0
-97ce4090943677f912a67602614ba019290301132a722d9def24580dab4ca88f
-75e616de9c77d9b8211ddff1b2e5571f484903965ee1ecfe8f444becb3e05b32
-4103bffbd47454e88d2f7fc2d25d4862cbe24193c3d5b156becc96bd95f6d17d"
+checksum="a633f63ff5d676d465ca5ba956f04e962fb0d4107d2ee9a02d90e230065bba56
+ e36fe673d65a64b33904970f970a05aaa82d9e47986fd5189d9b61fde9583e64
+ 381003ca95867ce2c5fc23d5dded8b6496fc62564a1e49ba13a132e2e423662b
+ 61ad12d1f0c0d9ff7680e1516788b32db7c834204a28a16775abb9dd56da28b9
+ 8d5f79749c1851d32664343e92f0a39499962303b243e72c38f591f9538b2b8f
+ 1a3ee5c4482ef9bd2d36f405c48de92bf2eab7d6ae4cb75b61121faf5ffc99dc
+ a2644033b6129aea582de8b71a6fc168fd71550841aaf58349872e83dbcd71c1
+ c706077dcc397924d79c869ada2437fda15e013953bd6755de2105825448f6c4
+ e52b5342e68496b72f56abd6e7e856bc50f21fc0516e44ae9d8bcbf9a60d203e
+ 4374938c61a4e0379b332ed24f3d9244f13c0e28d55143a2b846b6e4935a1c24
+ 95f7d3c0d1c220aa9abdcda3460caf6868e0318620e4e35d97d707d7b0117ab0
+ 6d315dfce61f1143cb89e32c9b47fabaf58e18cb93c49085504950bc2cfae5a0
+ b563395548b0c8c438f318d366bdbc264e9118b09206070625dfc03958ee2d9c
+ a36fd78b3baa4ab96dba2058db293dc8956b96cfef2fa2c0bdba60c348bc67e7
+ 4b36605ab7cc9190d372b028ffc7b3ca56252893d9481f3ff869f2c42474b0b2
+ d36df1747bf91e61cc19ed2396d02430f887a1ccae4c3631175b50c3caef880f
+ 0484c7f7062a2dde94f02c09138dd3c9af01a3e379f14b6c401d44a96ed541aa
+ 1247b69fa7a26f026ae16bc87e307201df85ffc875bfb019d4251e158d197fed
+ 981b82c331df5ea81f42116d299b91bd2fc279f3fa85242b13ea120ebc401f37
+ 0ae72aa1beb2ced286c966ead603afc18f2db3c25cc6f9152755b1ed629c3467
+ d4501c7f0fc09aaf3a099f902966d539bed62a10cde69b80c3d0792d800f795a
+ 0d5816c2e5954c87c8c0d073332ca29d034f719864268ac0e2d01b08c7b74f68
+ 38ec953a80215e6e2d7623a8d1e8adefa5039f64ae708c57e23d9fe2f94e904e
+ 0dae0cf9422f75e0cd4b105fa423d7074ee6285b99afba7e76bf0b440996710a
+ 75a14ded5448e539636f569930e7d17d67646c151645e944c18c39e0593fb551
+ c5523e887848da0856d50be613501d9d038e31094bb0f9a3d7e2592fcf05ab14
+ bf58395da0f409962148b1777f1c8aa26721c204fad1589b1492bc0e35cfae62
+ 91b473495a5c82589465cf0cf0e84faa9e5ba9a7e9e033c457bf9da5c9c08986
+ fc064c6b177eb293f4b4dc1ab40e236a72be8a44d5f383422e2a42d925606053
+ 43d0e461b2fb6576e285658bebcb41a4585502b3e403ad60b562eae6affb7766
+ 63d811853765803cb64b95eded3a0de7b867186882efe3e9f925ffd4d7bb940f
+ fa093681acdcf7f45216e49b5882ace38e653182d61ca9159a9dd7bc2c59a57c
+ 216db3820478c951f4594c03dcfee5480a0efdfbe5838acc4e73affcb17df31a
+ 0f7a116b3516ba31fd804a1311276fa5c644e1f398f636bd48bfc1ce72661e5b
+ 1266fe9ef4d0dfe24b199d7844300d5fb5321d7bb7225f7c902b415023911bcb
+ b0a1d851050e941fe28f967443b8d7287dab3ecc3303ec7f761ffec4cc10ef47
+ 7df9c803e9edd0e4980706fb5e6c2422919fde6da3d10866297704e2e86d986f
+ 02c7a7956783a2395171353ba5fc45dc5296b876ea7af35be755f8666b38abd9
+ 650c8c94aea499ebaf6875691dcc0fe1f7535e35a409d65d7ab6e7052d63cdd9
+ 103603c61cc5d0734a7eeea8326a463cf5cf9c6b8f7d431441d442ea9344b354
+ 3cd7767ebc5a218843fe2914ac026956addc60f82693fc43e60af1fe8abccbbe
+ a2a195c07ba2fce554d3997542da1c8c6cf45d49d326373508537005e5b31f7c
+ c39f0318614f2ee222964e4fd3768f772eb7348f17f9c21e4adfd66439551be7
+ 65416f6af10605a388251ce3add878c95ac1a1e6e925c087144608e3c95690e2
+ 7d590d53d6244384a2a7d3776bd5c7ab5e37a3b2edabcca5d6448ed7cc56cd62
+ d0708cb5ee33a9ed981ee3a4e855d78ad54a2ab23e0b5bb82fc4287224fb3a04
+ cb4b1a89b03c39e332544099f1868703c61cbfb522372c6a6ab3ff893b7ea0fa
+ a38e2a11f7696217d9c105b62b335dbd5b5ef3193804cecd2afcaf6a089dda03
+ a2b8989050b3c36bca76b8ac169e212d4ec19f487db8d908b1792ce8de8d4bcb
+ ffac3cc7a1eafdcee369d3a88aba6bf3116da37cd636084c8b0be50839c09cc3
+ 56d99171547a442c55ad25c6252244d964a7c2db4717ece4659ae9f6e515e085
+ 12e547ce451cfaaa1919748e206726a65434dba8f871f79f575c3c73b53493dc
+ aefc3626f4e4fe33074b8a08687b18b2ecf113d389712da5d73ae4957b7a00ae
+ 35b244f8be1e0c573cad64abf7da006bfd7a854aabb645fd35dbaf86316965fb
+ e550338dc4599958f32e07e3c034d836ced197e962dbc6311122eec1d2c0d81c
+ bbc3841e98942c828ad53ddb514cd86abb2a394f22407364b702777c828d330b
+ 4822eb9cc0cd4cc42ae8d4029f784a7b9c3a62a0d5dee5b8b020f1728254070a
+ 3354806c46e6bc3cc62fb05cd33ef481b09ee96a053c569a66dab28eb30d7d10
+ b3994f37b027aee6171a089c88b10bc0dd56e10f9844ab710d2821fcc9197edb
+ b44c4deea5e29f6cb8be705ab06de7527bd5fa9312b7d9322e219c834d310102
+ 6396200e5d3e55cd942a1238630b82fb65e0575bd2d76d645e99862d91813102
+ 4b6f6477a89a192fda19e2c5a1d52194e9350d70f60836b8411af9958d23e90f
+ 61e0efbf0218bb4dde676218adaad46aa0f8f1b89429dbfe1b93646035f6efdf
+ fe222029c0e2a175a8950bb0c3335c2a277eb87db528c67347f87ba05f78a8b6
+ 30e64b32873e24b79f94b73ae2c404ecdade3426f3a89d894c5096dc417db332
+ 229a275ba9547322bd0183b3b0d16f4ce7c992461f5378512dc865080b2cf990
+ 9392b96907c50749ed460bd0570bcdf085cdc22c63119b0a3570b4eb5be4441b
+ 70b436cf4c6ebdf02e6ba5fc84dfaee35477bb6085cf010283dcae9760f4b46f
+ 9ed7ea612383205971a2ca0fb573daf4530abb4134d968b72d96e8530c1edcb6
+ 5b24f85474d578f578ea505b3fc6c326181fbb6e52744895700d66c5507d94d1
+ 49590b2c0422f35a465fdcff13df2661137817758a648f4f0fa9ba0da33d3d1d
+ 030cd2d86671c8a2009a4512b15cbb5bbf08b69d6b1e7937cd483b1ecbeab43a
+ e4d798752e4263d6f486cb7339d5963eb60c9908e6f2835af637275c15e35412
+ 46731b30a6cb27805f7e8167e66b1dadde77a39ffdafebc03f11300e2fb10667
+ 76f1fbe98c36f2486dd15a1f15e0da9f012d2254860eacce2bdab160b1744db1
+ 7ec19b9293c3954e9e3326ed74297b46627ac5f5eb4056c66c724b6fdec260f0
+ db1ff15a26fdde55e626bdb49af86dc8d6f0b070b763d13c10d855d45edf924a
+ 55bf8c6ade4797dd39301244e8c1afa0c37c677373bc760edbffee26a8b3fcf2
+ f4e93da0fe15ba7687687991b8d00f5c9deabe37b6528ae5524682c5a7b91ecd
+ 57677bf4805c6de175eef204874f8fec55b7ff9f52d1f2b785e2b943e8cc5b60
+ 9fd5979c24743b52946eb5ee57894b4e3bb175f9e537527cfab4ed7942753423
+ 46b9917fb197b9d0e3a2dd53630aa1aeb2f0a163cce7cd0177bc3a050a552aca
+ 78a73aeb7ff1446e711efa44cf786e02f2d7c3a5217f14081ebf952748b4593b
+ 55549f13d07fd904190956146372c4fd6a0a3f96f7729f8cb96c20a7598b8b93
+ a79aea11e5a2fff37d0074ef2a1a947f1fe45c3228af25fc7030aad56017050b
+ a5237e51a1f712755778267fe30c51dfaf476b8031e4192d0ed3319495abdfe1
+ b466f0c29278ed5a02d36d87d77476dd3879af620cb98edb3f3760732e6e3ff1
+ 4b9252648f34c232a5bf65363fcad8682f123ce98f8c5b317df5b1a97497a814
+ e1b4daa5988928808bfe581cdebc78a62170214be7ed7c1c38ed5e083c6acff5
+ 63780cc2d60299e2187709639c6f7a7194526668289a448aeb2eb1754b12d2f5
+ 9b0701a0be10f6480f54332a8312d271266f3097d582ca88483365bfb931e2d1
+ 76dd82fb3c1e32ef21255cb635026443ae508ae8f5ed4a8bd22337d16acd9333
+ 0b64873a216da58695bc285607f992140b5172f8e3abb6f71864ad9aa3e97980"

From ef268c9a751820967cd200fb8e235fc057283b30 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 6 Jan 2021 23:58:53 +0100
Subject: [PATCH 208/752] firefox: update to 84.0.2.

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

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index a4ea1736e54..3fc52655d4e 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=84.0
+version=84.0.2
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138
+checksum=92bfd518d4f9760c897388a8e06130b171c1c43524d8af181add9daac2be7b37
 
 lib32disabled=yes
 
@@ -24,7 +24,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
  $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
-depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme"
+depends="nss>=3.60 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox-esr>=0"
 
 build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"

From 1aac86477ca35bf798e54d758ce75da336d08abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 209/752] firefox-esr: add ac_add_options
 --allow-addon-sideload

---
 srcpkgs/firefox-esr/files/mozconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig
index 31bb6dcd0f2..708ee9eded9 100644
--- a/srcpkgs/firefox-esr/files/mozconfig
+++ b/srcpkgs/firefox-esr/files/mozconfig
@@ -32,3 +32,4 @@ ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
+ac_add_options --allow-addon-sideload

From a36629e3cdf002bcf7f43cd49d2beca1945da9b5 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 25 Nov 2020 22:22:54 +0000
Subject: [PATCH 210/752] New package: julius-1.6.0

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

diff --git a/srcpkgs/julius/template b/srcpkgs/julius/template
new file mode 100644
index 00000000000..ae31e06ba01
--- /dev/null
+++ b/srcpkgs/julius/template
@@ -0,0 +1,21 @@
+# Template file for 'julius'
+pkgname=julius
+version=1.6.0
+revision=1
+build_style=cmake
+makedepends="SDL2-devel SDL2_mixer-devel libpng-devel"
+short_desc="Open source re-implementation of Caesar III"
+maintainer="marmeladema <xademax@gmail.com>"
+license="AGPL-3.0-only"
+homepage="https://github.com/bvschaik/julius"
+distfiles="https://github.com/bvschaik/julius/archive/v${version}.tar.gz"
+checksum=f50eade82c1f011a642a89ec526fe9e9589ac44ffa6041e072577336233b8166
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	configure_args="-DCMAKE_C_STANDARD_LIBRARIES=-lexecinfo"
+fi
+
+post_install() {
+	vlicense LICENSE.txt
+}

From a84348243315f4b3f8a6eacb7fddce2909bece6f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 31 Dec 2020 20:26:01 +0100
Subject: [PATCH 211/752] arpack-ng: update to 3.8.0.

Instead of using standard BLAS (package blas), use OpenBLAS (package
openblas) if available for the target architecture. Right now the only
package depending on arpack-ng is Octave and it uses OpenBLAS by
default, so I see no reason to use the slower standard BLAS on platforms
where OpenBLAS is available.

Also move headers into the -devel package.
---
 .../arpack-ng/patches/fix-gcc10-vector.patch  | 1118 -----------------
 srcpkgs/arpack-ng/template                    |   25 +-
 2 files changed, 20 insertions(+), 1123 deletions(-)
 delete mode 100644 srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch

diff --git a/srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch b/srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch
deleted file mode 100644
index 0a9a4048d7e..00000000000
--- a/srcpkgs/arpack-ng/patches/fix-gcc10-vector.patch
+++ /dev/null
@@ -1,1118 +0,0 @@
-Source: https://github.com/opencollab/arpack-ng/commit/9418632214acf6d387896ab29a8f5bdff2d4e38a
-
---- SRC/cgetv0.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cgetv0.f	2020-09-24 17:26:05.335777763 +0200
-@@ -361,9 +361,9 @@
- c     %--------------------------------------%
- c
-       if (msglvl .gt. 2) then
--          call svout (logfil, 1, rnorm0, ndigit,
-+          call svout (logfil, 1, [rnorm0], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm0 is')
--          call svout (logfil, 1, rnorm, ndigit,
-+          call svout (logfil, 1, [rnorm], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm is')
-       end if
- c
-@@ -394,7 +394,7 @@
-    50 continue
- c
-       if (msglvl .gt. 0) then
--         call svout (logfil, 1, rnorm, ndigit,
-+         call svout (logfil, 1, [rnorm], ndigit,
-      &        '_getv0: B-norm of initial / restarted starting vector')
-       end if
-       if (msglvl .gt. 2) then
---- SRC/cnaitr.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cnaitr.f	2020-09-24 17:26:05.336777763 +0200
-@@ -378,9 +378,9 @@
-  1000 continue
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &                  '_naitr: generating Arnoldi vector number')
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &                  '_naitr: B-norm of the current residual is')
-          end if
- c
-@@ -400,7 +400,7 @@
- c           %---------------------------------------------------%
- c
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, j, ndigit,
-+               call ivout (logfil, 1, [j], ndigit,
-      &                     '_naitr: ****** RESTART AT STEP ******')
-             end if
- c
-@@ -729,7 +729,7 @@
-          end if
- c
-          if (msglvl .gt. 0 .and. iter .gt. 0 ) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &           '_naitr: Iterative refinement for Arnoldi residual')
-             if (msglvl .gt. 2) then
-                 rtemp(1) = rnorm
---- SRC/cnapps.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cnapps.f	2020-09-24 17:26:05.336777763 +0200
-@@ -268,9 +268,9 @@
-          sigma = shift(jj)
- c
-          if (msglvl .gt. 2 ) then
--            call ivout (logfil, 1, jj, ndigit,
-+            call ivout (logfil, 1, [jj], ndigit,
-      &               '_napps: shift number.')
--            call cvout (logfil, 1, sigma, ndigit,
-+            call cvout (logfil, 1, [sigma], ndigit,
-      &               '_napps: Value of the shift ')
-          end if
- c
-@@ -291,9 +291,9 @@
-             if ( abs(real(h(i+1,i)))
-      &           .le. max(ulp*tst1, smlnum) )  then
-                if (msglvl .gt. 0) then
--                  call ivout (logfil, 1, i, ndigit,
-+                  call ivout (logfil, 1, [i], ndigit,
-      &                 '_napps: matrix splitting at row/column no.')
--                  call ivout (logfil, 1, jj, ndigit,
-+                  call ivout (logfil, 1, [jj], ndigit,
-      &                 '_napps: matrix splitting with shift number.')
-                   call cvout (logfil, 1, h(i+1,i), ndigit,
-      &                 '_napps: off diagonal element.')
-@@ -307,9 +307,9 @@
-    40    continue
- c
-          if (msglvl .gt. 2) then
--             call ivout (logfil, 1, istart, ndigit,
-+             call ivout (logfil, 1, [istart], ndigit,
-      &                   '_napps: Start of current block ')
--             call ivout (logfil, 1, iend, ndigit,
-+             call ivout (logfil, 1, [iend], ndigit,
-      &                   '_napps: End of current block ')
-          end if
- c
-@@ -485,7 +485,7 @@
-      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
-          call cvout (logfil, 1, h(kev+1,kev), ndigit,
-      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
--         call ivout (logfil, 1, kev, ndigit,
-+         call ivout (logfil, 1, [kev], ndigit,
-      &               '_napps: Order of the final Hessenberg matrix ')
-          if (msglvl .gt. 2) then
-             call cmout (logfil, kev, kev, h, ldh, ndigit,
---- SRC/cnaup2.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cnaup2.f	2020-09-24 17:26:05.336777763 +0200
-@@ -389,7 +389,7 @@
-          iter = iter + 1
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, iter, ndigit,
-+            call ivout (logfil, 1, [iter], ndigit,
-      &           '_naup2: **** Start of major iteration number ****')
-          end if
- c
-@@ -402,9 +402,9 @@
-          np  = kplusp - nev
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, nev, ndigit,
-+            call ivout (logfil, 1, [nev], ndigit,
-      &     '_naup2: The length of the current Arnoldi factorization')
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &           '_naup2: Extend the Arnoldi factorization by')
-          end if
- c
-@@ -430,7 +430,7 @@
-          update = .false.
- c
-          if (msglvl .gt. 1) then
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &           '_naup2: Corresponding B-norm of the residual')
-          end if
- c
-@@ -658,7 +658,7 @@
-          end if
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, nconv, ndigit,
-+            call ivout (logfil, 1, [nconv], ndigit,
-      &           '_naup2: no. of "converged" Ritz values at this iter.')
-             if (msglvl .gt. 1) then
-                kp(1) = nev
-@@ -698,7 +698,7 @@
-          end if
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &                  '_naup2: The number of shifts to apply ')
-             call cvout (logfil, np, ritz, ndigit,
-      &                  '_naup2: values of the shifts')
-@@ -762,7 +762,7 @@
-          cnorm = .false.
- c
-          if (msglvl .gt. 2) then
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &      '_naup2: B-norm of residual for compressed factorization')
-             call cmout (logfil, nev, nev, h, ldh, ndigit,
-      &        '_naup2: Compressed upper Hessenberg matrix H')
---- SRC/cnaupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cnaupd.f	2020-09-24 17:26:05.336777763 +0200
-@@ -601,9 +601,9 @@
-       if (info .eq. 2) info = 3
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, mxiter, ndigit,
-+         call ivout (logfil, 1, [mxiter], ndigit,
-      &               '_naupd: Number of update iterations taken')
--         call ivout (logfil, 1, np, ndigit,
-+         call ivout (logfil, 1, [np], ndigit,
-      &               '_naupd: Number of wanted "converged" Ritz values')
-          call cvout (logfil, np, workl(ritz), ndigit,
-      &               '_naupd: The final Ritz values')
---- SRC/cneupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cneupd.f	2020-09-24 17:26:05.337777763 +0200
-@@ -536,9 +536,9 @@
- c        %-----------------------------------------------------------%
- c
-          if (msglvl .gt. 2) then
--             call ivout(logfil, 1, numcnv, ndigit,
-+             call ivout(logfil, 1, [numcnv], ndigit,
-      &            '_neupd: Number of specified eigenvalues')
--             call ivout(logfil, 1, nconv, ndigit,
-+             call ivout(logfil, 1, [nconv], ndigit,
-      &            '_neupd: Number of "converged" eigenvalues')
-          end if
- c
---- SRC/cngets.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/cngets.f	2020-09-24 17:26:05.337777763 +0200
-@@ -161,8 +161,8 @@
-       tcgets = tcgets + (t1 - t0)
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
--         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
-+         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
-+         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
-          call cvout (logfil, kev+np, ritz, ndigit,
-      &        '_ngets: Eigenvalues of current H matrix ')
-          call cvout (logfil, kev+np, bounds, ndigit,
---- SRC/dgetv0.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dgetv0.f	2020-09-24 17:26:05.337777763 +0200
-@@ -366,9 +366,9 @@
- c     %--------------------------------------%
- c
-       if (msglvl .gt. 2) then
--          call dvout (logfil, 1, rnorm0, ndigit,
-+          call dvout (logfil, 1, [rnorm0], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm0 is')
--          call dvout (logfil, 1, rnorm, ndigit,
-+          call dvout (logfil, 1, [rnorm], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm is')
-       end if
- c
-@@ -399,7 +399,7 @@
-    50 continue
- c
-       if (msglvl .gt. 0) then
--         call dvout (logfil, 1, rnorm, ndigit,
-+         call dvout (logfil, 1, [rnorm], ndigit,
-      &        '_getv0: B-norm of initial / restarted starting vector')
-       end if
-       if (msglvl .gt. 3) then
---- SRC/dnaitr.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dnaitr.f	2020-09-24 17:26:05.337777763 +0200
-@@ -371,9 +371,9 @@
-  1000 continue
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &                  '_naitr: generating Arnoldi vector number')
--            call dvout (logfil, 1, rnorm, ndigit,
-+            call dvout (logfil, 1, [rnorm], ndigit,
-      &                  '_naitr: B-norm of the current residual is')
-          end if
- c
-@@ -393,7 +393,7 @@
- c           %---------------------------------------------------%
- c
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, j, ndigit,
-+               call ivout (logfil, 1, [j], ndigit,
-      &                     '_naitr: ****** RESTART AT STEP ******')
-             end if
- c
-@@ -721,7 +721,7 @@
-          end if
- c
-          if (msglvl .gt. 0 .and. iter .gt. 0) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &           '_naitr: Iterative refinement for Arnoldi residual')
-             if (msglvl .gt. 2) then
-                 xtemp(1) = rnorm
---- SRC/dnapps.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dnapps.f	2020-09-24 17:26:05.338777763 +0200
-@@ -266,11 +266,11 @@
-          sigmai = shifti(jj)
- c
-          if (msglvl .gt. 2 ) then
--            call ivout (logfil, 1, jj, ndigit,
-+            call ivout (logfil, 1, [jj], ndigit,
-      &               '_napps: shift number.')
--            call dvout (logfil, 1, sigmar, ndigit,
-+            call dvout (logfil, 1, [sigmar], ndigit,
-      &               '_napps: The real part of the shift ')
--            call dvout (logfil, 1, sigmai, ndigit,
-+            call dvout (logfil, 1, [sigmai], ndigit,
-      &               '_napps: The imaginary part of the shift ')
-          end if
- c
-@@ -335,9 +335,9 @@
-      &         tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl )
-             if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then
-                if (msglvl .gt. 0) then
--                  call ivout (logfil, 1, i, ndigit,
-+                  call ivout (logfil, 1, [i], ndigit,
-      &                 '_napps: matrix splitting at row/column no.')
--                  call ivout (logfil, 1, jj, ndigit,
-+                  call ivout (logfil, 1, [jj], ndigit,
-      &                 '_napps: matrix splitting with shift number.')
-                   call dvout (logfil, 1, h(i+1,i), ndigit,
-      &                 '_napps: off diagonal element.')
-@@ -351,9 +351,9 @@
-    40    continue
- c
-          if (msglvl .gt. 2) then
--             call ivout (logfil, 1, istart, ndigit,
-+             call ivout (logfil, 1, [istart], ndigit,
-      &                   '_napps: Start of current block ')
--             call ivout (logfil, 1, iend, ndigit,
-+             call ivout (logfil, 1, [iend], ndigit,
-      &                   '_napps: End of current block ')
-          end if
- c
-@@ -627,7 +627,7 @@
-      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
-          call dvout (logfil, 1, h(kev+1,kev), ndigit,
-      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
--         call ivout (logfil, 1, kev, ndigit,
-+         call ivout (logfil, 1, [kev], ndigit,
-      &               '_napps: Order of the final Hessenberg matrix ')
-          if (msglvl .gt. 2) then
-             call dmout (logfil, kev, kev, h, ldh, ndigit,
---- SRC/dnaup2.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dnaup2.f	2020-09-24 17:26:05.338777763 +0200
-@@ -388,7 +388,7 @@
-          iter = iter + 1
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, iter, ndigit,
-+            call ivout (logfil, 1, [iter], ndigit,
-      &           '_naup2: **** Start of major iteration number ****')
-          end if
- c
-@@ -401,9 +401,9 @@
-          np  = kplusp - nev
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, nev, ndigit,
-+            call ivout (logfil, 1, [nev], ndigit,
-      &     '_naup2: The length of the current Arnoldi factorization')
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &           '_naup2: Extend the Arnoldi factorization by')
-          end if
- c
-@@ -435,7 +435,7 @@
-          update = .false.
- c
-          if (msglvl .gt. 1) then
--            call dvout  (logfil, 1, rnorm, ndigit,
-+            call dvout  (logfil, 1, [rnorm], ndigit,
-      &           '_naup2: Corresponding B-norm of the residual')
-          end if
- c
-@@ -689,7 +689,7 @@
-          end if
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, nconv, ndigit,
-+            call ivout (logfil, 1, [nconv], ndigit,
-      &           '_naup2: no. of "converged" Ritz values at this iter.')
-             if (msglvl .gt. 1) then
-                kp(1) = nev
-@@ -741,7 +741,7 @@
-          end if
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &                  '_naup2: The number of shifts to apply ')
-             call dvout  (logfil, np, ritzr, ndigit,
-      &                  '_naup2: Real part of the shifts')
-@@ -807,7 +807,7 @@
-          cnorm = .false.
- c
-          if (msglvl .gt. 2) then
--            call dvout  (logfil, 1, rnorm, ndigit,
-+            call dvout  (logfil, 1, [rnorm], ndigit,
-      &      '_naup2: B-norm of residual for compressed factorization')
-             call dmout  (logfil, nev, nev, h, ldh, ndigit,
-      &        '_naup2: Compressed upper Hessenberg matrix H')
---- SRC/dnaupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dnaupd.f	2020-09-24 17:26:05.338777763 +0200
-@@ -628,9 +628,9 @@
-       if (info .eq. 2) info = 3
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, mxiter, ndigit,
-+         call ivout (logfil, 1, [mxiter], ndigit,
-      &               '_naupd: Number of update iterations taken')
--         call ivout (logfil, 1, np, ndigit,
-+         call ivout (logfil, 1, [np], ndigit,
-      &               '_naupd: Number of wanted "converged" Ritz values')
-          call dvout  (logfil, np, workl(ritzr), ndigit,
-      &               '_naupd: Real part of the final Ritz values')
---- SRC/dneupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dneupd.f	2020-09-24 17:26:05.339777763 +0200
-@@ -601,9 +601,9 @@
- c        %-----------------------------------------------------------%
- c
-          if (msglvl .gt. 2) then
--             call ivout(logfil, 1, numcnv, ndigit,
-+             call ivout(logfil, 1, [numcnv], ndigit,
-      &            '_neupd: Number of specified eigenvalues')
--             call ivout(logfil, 1, nconv, ndigit,
-+             call ivout(logfil, 1, [nconv], ndigit,
-      &            '_neupd: Number of "converged" eigenvalues')
-          end if
- c
---- SRC/dngets.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dngets.f	2020-09-24 17:26:05.339777763 +0200
-@@ -212,8 +212,8 @@
-       tngets = tngets + (t1 - t0)
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
--         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
-+         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
-+         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
-          call dvout (logfil, kev+np, ritzr, ndigit,
-      &        '_ngets: Eigenvalues of current H matrix -- real part')
-          call dvout (logfil, kev+np, ritzi, ndigit,
---- SRC/dsaitr.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dsaitr.f	2020-09-24 17:26:05.339777763 +0200
-@@ -364,9 +364,9 @@
-  1000 continue
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &                  '_saitr: generating Arnoldi vector no.')
--            call dvout (logfil, 1, rnorm, ndigit,
-+            call dvout (logfil, 1, [rnorm], ndigit,
-      &                  '_saitr: B-norm of the current residual =')
-          end if
- c
-@@ -384,7 +384,7 @@
- c           %---------------------------------------------------%
- c
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, j, ndigit,
-+               call ivout (logfil, 1, [j], ndigit,
-      &                     '_saitr: ****** restart at step ******')
-             end if
- c
-@@ -735,7 +735,7 @@
-          end if
- c
-          if (msglvl .gt. 0 .and. iter .gt. 0) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &           '_saitr: Iterative refinement for Arnoldi residual')
-             if (msglvl .gt. 2) then
-                 xtemp(1) = rnorm
---- SRC/dsapps.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dsapps.f	2020-09-24 17:26:05.339777763 +0200
-@@ -261,9 +261,9 @@
-             big   = abs(h(i,2)) + abs(h(i+1,2))
-             if (h(i+1,1) .le. epsmch*big) then
-                if (msglvl .gt. 0) then
--                  call ivout (logfil, 1, i, ndigit,
-+                  call ivout (logfil, 1, [i], ndigit,
-      &                 '_sapps: deflation at row/column no.')
--                  call ivout (logfil, 1, jj, ndigit,
-+                  call ivout (logfil, 1, [jj], ndigit,
-      &                 '_sapps: occurred before shift number.')
-                   call dvout (logfil, 1, h(i+1,1), ndigit,
-      &                 '_sapps: the corresponding off diagonal element')
-@@ -432,7 +432,7 @@
-          big   = abs(h(i,2)) + abs(h(i+1,2))
-          if (h(i+1,1) .le. epsmch*big) then
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, i, ndigit,
-+               call ivout (logfil, 1, [i], ndigit,
-      &              '_sapps: deflation at row/column no.')
-                call dvout (logfil, 1, h(i+1,1), ndigit,
-      &              '_sapps: the corresponding off diagonal element')
---- SRC/dsaup2.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dsaup2.f	2020-09-24 17:26:05.339777763 +0200
-@@ -402,13 +402,13 @@
-          iter = iter + 1
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, iter, ndigit,
-+            call ivout (logfil, 1, [iter], ndigit,
-      &           '_saup2: **** Start of major iteration number ****')
-          end if
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, nev, ndigit,
-+            call ivout (logfil, 1, [nev], ndigit,
-      &     '_saup2: The length of the current Lanczos factorization')
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &           '_saup2: Extend the Lanczos factorization by')
-          end if
- c
-@@ -446,7 +446,7 @@
-          update = .false.
- c
-          if (msglvl .gt. 1) then
--            call dvout (logfil, 1, rnorm, ndigit,
-+            call dvout (logfil, 1, [rnorm], ndigit,
-      &           '_saup2: Current B-norm of residual for factorization')
-          end if
- c
-@@ -695,7 +695,7 @@
-          end if
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, nconv, ndigit,
-+            call ivout (logfil, 1, [nconv], ndigit,
-      &           '_saup2: no. of "converged" Ritz values at this iter.')
-             if (msglvl .gt. 1) then
-                kp(1) = nev
-@@ -743,7 +743,7 @@
-          if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1)
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &                  '_saup2: The number of shifts to apply ')
-             call dvout (logfil, np, workl, ndigit,
-      &                  '_saup2: shifts selected')
-@@ -810,7 +810,7 @@
-   130    continue
- c
-          if (msglvl .gt. 2) then
--            call dvout (logfil, 1, rnorm, ndigit,
-+            call dvout (logfil, 1, [rnorm], ndigit,
-      &      '_saup2: B-norm of residual for NEV factorization')
-             call dvout (logfil, nev, h(1,2), ndigit,
-      &           '_saup2: main diagonal of compressed H matrix')
---- SRC/dsaupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dsaupd.f	2020-09-24 17:26:05.339777763 +0200
-@@ -628,9 +628,9 @@
-       if (info .eq. 2) info = 3
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, mxiter, ndigit,
-+         call ivout (logfil, 1, [mxiter], ndigit,
-      &               '_saupd: number of update iterations taken')
--         call ivout (logfil, 1, np, ndigit,
-+         call ivout (logfil, 1, [np], ndigit,
-      &               '_saupd: number of "converged" Ritz values')
-          call dvout  (logfil, np, workl(Ritz), ndigit,
-      &               '_saupd: final Ritz values')
---- SRC/dseupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dseupd.f	2020-09-24 17:26:05.340777763 +0200
-@@ -513,9 +513,9 @@
- c        %-----------------------------------------------------------%
- c
-          if (msglvl .gt. 2) then
--             call ivout(logfil, 1, numcnv, ndigit,
-+             call ivout(logfil, 1, [numcnv], ndigit,
-      &            '_seupd: Number of specified eigenvalues')
--             call ivout(logfil, 1, nconv, ndigit,
-+             call ivout(logfil, 1, [nconv], ndigit,
-      &            '_seupd: Number of "converged" eigenvalues')
-          end if
- c
---- SRC/dsgets.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/dsgets.f	2020-09-24 17:26:05.340777763 +0200
-@@ -202,8 +202,8 @@
-       tsgets = tsgets + (t1 - t0)
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is')
--         call ivout (logfil, 1, np, ndigit, '_sgets: NP is')
-+         call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is')
-+         call ivout (logfil, 1, [np], ndigit, '_sgets: NP is')
-          call dvout (logfil, kev+np, ritz, ndigit,
-      &        '_sgets: Eigenvalues of current H matrix')
-          call dvout (logfil, kev+np, bounds, ndigit,
---- SRC/sgetv0.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/sgetv0.f	2020-09-24 17:26:05.342777763 +0200
-@@ -366,9 +366,9 @@
- c     %--------------------------------------%
- c
-       if (msglvl .gt. 2) then
--          call svout (logfil, 1, rnorm0, ndigit,
-+          call svout (logfil, 1, [rnorm0], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm0 is')
--          call svout (logfil, 1, rnorm, ndigit,
-+          call svout (logfil, 1, [rnorm], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm is')
-       end if
- c
-@@ -399,7 +399,7 @@
-    50 continue
- c
-       if (msglvl .gt. 0) then
--         call svout (logfil, 1, rnorm, ndigit,
-+         call svout (logfil, 1, [rnorm], ndigit,
-      &        '_getv0: B-norm of initial / restarted starting vector')
-       end if
-       if (msglvl .gt. 3) then
---- SRC/snaitr.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/snaitr.f	2020-09-24 17:26:05.342777763 +0200
-@@ -371,9 +371,9 @@
-  1000 continue
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &                  '_naitr: generating Arnoldi vector number')
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &                  '_naitr: B-norm of the current residual is')
-          end if
- c
-@@ -393,7 +393,7 @@
- c           %---------------------------------------------------%
- c
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, j, ndigit,
-+               call ivout (logfil, 1, [j], ndigit,
-      &                     '_naitr: ****** RESTART AT STEP ******')
-             end if
- c
-@@ -721,7 +721,7 @@
-          end if
- c
-          if (msglvl .gt. 0 .and. iter .gt. 0) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &           '_naitr: Iterative refinement for Arnoldi residual')
-             if (msglvl .gt. 2) then
-                 xtemp(1) = rnorm
---- SRC/snapps.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/snapps.f	2020-09-24 17:26:05.342777763 +0200
-@@ -266,11 +266,11 @@
-          sigmai = shifti(jj)
- c
-          if (msglvl .gt. 2 ) then
--            call ivout (logfil, 1, jj, ndigit,
-+            call ivout (logfil, 1, [jj], ndigit,
-      &               '_napps: shift number.')
--            call svout (logfil, 1, sigmar, ndigit,
-+            call svout (logfil, 1, [sigmar], ndigit,
-      &               '_napps: The real part of the shift ')
--            call svout (logfil, 1, sigmai, ndigit,
-+            call svout (logfil, 1, [sigmai], ndigit,
-      &               '_napps: The imaginary part of the shift ')
-          end if
- c
-@@ -335,9 +335,9 @@
-      &         tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl )
-             if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then
-                if (msglvl .gt. 0) then
--                  call ivout (logfil, 1, i, ndigit,
-+                  call ivout (logfil, 1, [i], ndigit,
-      &                 '_napps: matrix splitting at row/column no.')
--                  call ivout (logfil, 1, jj, ndigit,
-+                  call ivout (logfil, 1, [jj], ndigit,
-      &                 '_napps: matrix splitting with shift number.')
-                   call svout (logfil, 1, h(i+1,i), ndigit,
-      &                 '_napps: off diagonal element.')
-@@ -351,9 +351,9 @@
-    40    continue
- c
-          if (msglvl .gt. 2) then
--             call ivout (logfil, 1, istart, ndigit,
-+             call ivout (logfil, 1, [istart], ndigit,
-      &                   '_napps: Start of current block ')
--             call ivout (logfil, 1, iend, ndigit,
-+             call ivout (logfil, 1, [iend], ndigit,
-      &                   '_napps: End of current block ')
-          end if
- c
-@@ -625,7 +625,7 @@
-      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
-          call svout (logfil, 1, h(kev+1,kev), ndigit,
-      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
--         call ivout (logfil, 1, kev, ndigit,
-+         call ivout (logfil, 1, [kev], ndigit,
-      &               '_napps: Order of the final Hessenberg matrix ')
-          if (msglvl .gt. 2) then
-             call smout (logfil, kev, kev, h, ldh, ndigit,
---- SRC/snaup2.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/snaup2.f	2020-09-24 17:26:05.342777763 +0200
-@@ -388,7 +388,7 @@
-          iter = iter + 1
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, iter, ndigit,
-+            call ivout (logfil, 1, [iter], ndigit,
-      &           '_naup2: **** Start of major iteration number ****')
-          end if
- c
-@@ -401,9 +401,9 @@
-          np  = kplusp - nev
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, nev, ndigit,
-+            call ivout (logfil, 1, [nev], ndigit,
-      &     '_naup2: The length of the current Arnoldi factorization')
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &           '_naup2: Extend the Arnoldi factorization by')
-          end if
- c
-@@ -435,7 +435,7 @@
-          update = .false.
- c
-          if (msglvl .gt. 1) then
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &           '_naup2: Corresponding B-norm of the residual')
-          end if
- c
-@@ -690,7 +690,7 @@
-          end if
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, nconv, ndigit,
-+            call ivout (logfil, 1, [nconv], ndigit,
-      &           '_naup2: no. of "converged" Ritz values at this iter.')
-             if (msglvl .gt. 1) then
-                kp(1) = nev
-@@ -742,7 +742,7 @@
-          end if
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &                  '_naup2: The number of shifts to apply ')
-             call svout (logfil, np, ritzr, ndigit,
-      &                  '_naup2: Real part of the shifts')
-@@ -808,7 +808,7 @@
-          cnorm = .false.
- c
-          if (msglvl .gt. 2) then
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &      '_naup2: B-norm of residual for compressed factorization')
-             call smout (logfil, nev, nev, h, ldh, ndigit,
-      &        '_naup2: Compressed upper Hessenberg matrix H')
---- SRC/snaupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/snaupd.f	2020-09-24 17:26:05.343777763 +0200
-@@ -628,9 +628,9 @@
-       if (info .eq. 2) info = 3
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, mxiter, ndigit,
-+         call ivout (logfil, 1, [mxiter], ndigit,
-      &               '_naupd: Number of update iterations taken')
--         call ivout (logfil, 1, np, ndigit,
-+         call ivout (logfil, 1, [np], ndigit,
-      &               '_naupd: Number of wanted "converged" Ritz values')
-          call svout (logfil, np, workl(ritzr), ndigit,
-      &               '_naupd: Real part of the final Ritz values')
---- SRC/sneupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/sneupd.f	2020-09-24 17:26:05.343777763 +0200
-@@ -601,9 +601,9 @@
- c        %-----------------------------------------------------------%
- c
-          if (msglvl .gt. 2) then
--             call ivout(logfil, 1, numcnv, ndigit,
-+             call ivout(logfil, 1, [numcnv], ndigit,
-      &            '_neupd: Number of specified eigenvalues')
--             call ivout(logfil, 1, nconv, ndigit,
-+             call ivout(logfil, 1, [nconv], ndigit,
-      &            '_neupd: Number of "converged" eigenvalues')
-          end if
- c
---- SRC/sngets.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/sngets.f	2020-09-24 17:26:05.344777764 +0200
-@@ -212,8 +212,8 @@
-       tngets = tngets + (t1 - t0)
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
--         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
-+         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
-+         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
-          call svout (logfil, kev+np, ritzr, ndigit,
-      &        '_ngets: Eigenvalues of current H matrix -- real part')
-          call svout (logfil, kev+np, ritzi, ndigit,
---- SRC/ssaitr.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/ssaitr.f	2020-09-24 17:26:05.344777764 +0200
-@@ -364,9 +364,9 @@
-  1000 continue
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &                  '_saitr: generating Arnoldi vector no.')
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &                  '_saitr: B-norm of the current residual =')
-          end if
- c
-@@ -384,7 +384,7 @@
- c           %---------------------------------------------------%
- c
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, j, ndigit,
-+               call ivout (logfil, 1, [j], ndigit,
-      &                     '_saitr: ****** restart at step ******')
-             end if
- c
-@@ -735,7 +735,7 @@
-          end if
- c
-          if (msglvl .gt. 0 .and. iter .gt. 0) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &           '_saitr: Iterative refinement for Arnoldi residual')
-             if (msglvl .gt. 2) then
-                 xtemp(1) = rnorm
---- SRC/ssapps.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/ssapps.f	2020-09-24 17:26:05.344777764 +0200
-@@ -261,9 +261,9 @@
-             big   = abs(h(i,2)) + abs(h(i+1,2))
-             if (h(i+1,1) .le. epsmch*big) then
-                if (msglvl .gt. 0) then
--                  call ivout (logfil, 1, i, ndigit,
-+                  call ivout (logfil, 1, [i], ndigit,
-      &                 '_sapps: deflation at row/column no.')
--                  call ivout (logfil, 1, jj, ndigit,
-+                  call ivout (logfil, 1, [jj], ndigit,
-      &                 '_sapps: occurred before shift number.')
-                   call svout (logfil, 1, h(i+1,1), ndigit,
-      &                 '_sapps: the corresponding off diagonal element')
-@@ -432,7 +432,7 @@
-          big   = abs(h(i,2)) + abs(h(i+1,2))
-          if (h(i+1,1) .le. epsmch*big) then
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, i, ndigit,
-+               call ivout (logfil, 1, [i], ndigit,
-      &              '_sapps: deflation at row/column no.')
-                call svout (logfil, 1, h(i+1,1), ndigit,
-      &              '_sapps: the corresponding off diagonal element')
---- SRC/ssaup2.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/ssaup2.f	2020-09-24 17:26:05.344777764 +0200
-@@ -402,13 +402,13 @@
-          iter = iter + 1
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, iter, ndigit,
-+            call ivout (logfil, 1, [iter], ndigit,
-      &           '_saup2: **** Start of major iteration number ****')
-          end if
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, nev, ndigit,
-+            call ivout (logfil, 1, [nev], ndigit,
-      &     '_saup2: The length of the current Lanczos factorization')
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &           '_saup2: Extend the Lanczos factorization by')
-          end if
- c
-@@ -446,7 +446,7 @@
-          update = .false.
- c
-          if (msglvl .gt. 1) then
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &           '_saup2: Current B-norm of residual for factorization')
-          end if
- c
-@@ -694,7 +694,7 @@
-          end if
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, nconv, ndigit,
-+            call ivout (logfil, 1, [nconv], ndigit,
-      &           '_saup2: no. of "converged" Ritz values at this iter.')
-             if (msglvl .gt. 1) then
-                kp(1) = nev
-@@ -742,7 +742,7 @@
-          if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1)
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &                  '_saup2: The number of shifts to apply ')
-             call svout (logfil, np, workl, ndigit,
-      &                  '_saup2: shifts selected')
-@@ -809,7 +809,7 @@
-   130    continue
- c
-          if (msglvl .gt. 2) then
--            call svout (logfil, 1, rnorm, ndigit,
-+            call svout (logfil, 1, [rnorm], ndigit,
-      &      '_saup2: B-norm of residual for NEV factorization')
-             call svout (logfil, nev, h(1,2), ndigit,
-      &           '_saup2: main diagonal of compressed H matrix')
---- SRC/ssaupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/ssaupd.f	2020-09-24 17:26:05.344777764 +0200
-@@ -628,9 +628,9 @@
-       if (info .eq. 2) info = 3
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, mxiter, ndigit,
-+         call ivout (logfil, 1, [mxiter], ndigit,
-      &               '_saupd: number of update iterations taken')
--         call ivout (logfil, 1, np, ndigit,
-+         call ivout (logfil, 1, [np], ndigit,
-      &               '_saupd: number of "converged" Ritz values')
-          call svout (logfil, np, workl(Ritz), ndigit,
-      &               '_saupd: final Ritz values')
---- SRC/sseupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/sseupd.f	2020-09-24 17:26:05.345777764 +0200
-@@ -513,9 +513,9 @@
- c        %-----------------------------------------------------------%
- c
-          if (msglvl .gt. 2) then
--             call ivout(logfil, 1, numcnv, ndigit,
-+             call ivout(logfil, 1, [numcnv], ndigit,
-      &            '_seupd: Number of specified eigenvalues')
--             call ivout(logfil, 1, nconv, ndigit,
-+             call ivout(logfil, 1, [nconv], ndigit,
-      &            '_seupd: Number of "converged" eigenvalues')
-          end if
- c
---- SRC/ssgets.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/ssgets.f	2020-09-24 17:26:05.345777764 +0200
-@@ -202,8 +202,8 @@
-       tsgets = tsgets + (t1 - t0)
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is')
--         call ivout (logfil, 1, np, ndigit, '_sgets: NP is')
-+         call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is')
-+         call ivout (logfil, 1, [np], ndigit, '_sgets: NP is')
-          call svout (logfil, kev+np, ritz, ndigit,
-      &        '_sgets: Eigenvalues of current H matrix')
-          call svout (logfil, kev+np, bounds, ndigit,
---- SRC/zgetv0.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/zgetv0.f	2020-09-24 17:26:05.346777764 +0200
-@@ -361,9 +361,9 @@
- c     %--------------------------------------%
- c
-       if (msglvl .gt. 2) then
--          call dvout (logfil, 1, rnorm0, ndigit,
-+          call dvout (logfil, 1, [rnorm0], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm0 is')
--          call dvout (logfil, 1, rnorm, ndigit,
-+          call dvout (logfil, 1, [rnorm], ndigit,
-      &                '_getv0: re-orthonalization ; rnorm is')
-       end if
- c
-@@ -394,7 +394,7 @@
-    50 continue
- c
-       if (msglvl .gt. 0) then
--         call dvout (logfil, 1, rnorm, ndigit,
-+         call dvout (logfil, 1, [rnorm], ndigit,
-      &        '_getv0: B-norm of initial / restarted starting vector')
-       end if
-       if (msglvl .gt. 2) then
---- SRC/znaitr.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/znaitr.f	2020-09-24 17:26:05.347777764 +0200
-@@ -378,9 +378,9 @@
-  1000 continue
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &                  '_naitr: generating Arnoldi vector number')
--            call dvout (logfil, 1, rnorm, ndigit,
-+            call dvout (logfil, 1, [rnorm], ndigit,
-      &                  '_naitr: B-norm of the current residual is')
-          end if
- c
-@@ -400,7 +400,7 @@
- c           %---------------------------------------------------%
- c
-             if (msglvl .gt. 0) then
--               call ivout (logfil, 1, j, ndigit,
-+               call ivout (logfil, 1, [j], ndigit,
-      &                     '_naitr: ****** RESTART AT STEP ******')
-             end if
- c
-@@ -729,7 +729,7 @@
-          end if
- c
-          if (msglvl .gt. 0 .and. iter .gt. 0 ) then
--            call ivout (logfil, 1, j, ndigit,
-+            call ivout (logfil, 1, [j], ndigit,
-      &           '_naitr: Iterative refinement for Arnoldi residual')
-             if (msglvl .gt. 2) then
-                 rtemp(1) = rnorm
---- SRC/znapps.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/znapps.f	2020-09-24 17:26:05.347777764 +0200
-@@ -268,9 +268,9 @@
-          sigma = shift(jj)
- c
-          if (msglvl .gt. 2 ) then
--            call ivout (logfil, 1, jj, ndigit,
-+            call ivout (logfil, 1, [jj], ndigit,
-      &               '_napps: shift number.')
--            call zvout (logfil, 1, sigma, ndigit,
-+            call zvout (logfil, 1, [sigma], ndigit,
-      &               '_napps: Value of the shift ')
-          end if
- c
-@@ -291,9 +291,9 @@
-             if ( abs(dble(h(i+1,i)))
-      &           .le. max(ulp*tst1, smlnum) )  then
-                if (msglvl .gt. 0) then
--                  call ivout (logfil, 1, i, ndigit,
-+                  call ivout (logfil, 1, [i], ndigit,
-      &                 '_napps: matrix splitting at row/column no.')
--                  call ivout (logfil, 1, jj, ndigit,
-+                  call ivout (logfil, 1, [jj], ndigit,
-      &                 '_napps: matrix splitting with shift number.')
-                   call zvout (logfil, 1, h(i+1,i), ndigit,
-      &                 '_napps: off diagonal element.')
-@@ -307,9 +307,9 @@
-    40    continue
- c
-          if (msglvl .gt. 2) then
--             call ivout (logfil, 1, istart, ndigit,
-+             call ivout (logfil, 1, [istart], ndigit,
-      &                   '_napps: Start of current block ')
--             call ivout (logfil, 1, iend, ndigit,
-+             call ivout (logfil, 1, [iend], ndigit,
-      &                   '_napps: End of current block ')
-          end if
- c
-@@ -485,7 +485,7 @@
-      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
-          call zvout (logfil, 1, h(kev+1,kev), ndigit,
-      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
--         call ivout (logfil, 1, kev, ndigit,
-+         call ivout (logfil, 1, [kev], ndigit,
-      &               '_napps: Order of the final Hessenberg matrix ')
-          if (msglvl .gt. 2) then
-             call zmout (logfil, kev, kev, h, ldh, ndigit,
---- SRC/znaup2.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/znaup2.f	2020-09-24 17:26:05.347777764 +0200
-@@ -389,7 +389,7 @@
-          iter = iter + 1
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, iter, ndigit,
-+            call ivout (logfil, 1, [iter], ndigit,
-      &           '_naup2: **** Start of major iteration number ****')
-          end if
- c
-@@ -402,9 +402,9 @@
-          np  = kplusp - nev
- c
-          if (msglvl .gt. 1) then
--            call ivout (logfil, 1, nev, ndigit,
-+            call ivout (logfil, 1, [nev], ndigit,
-      &     '_naup2: The length of the current Arnoldi factorization')
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &           '_naup2: Extend the Arnoldi factorization by')
-          end if
- c
-@@ -430,7 +430,7 @@
-          update = .false.
- c
-          if (msglvl .gt. 1) then
--            call dvout  (logfil, 1, rnorm, ndigit,
-+            call dvout  (logfil, 1, [rnorm], ndigit,
-      &           '_naup2: Corresponding B-norm of the residual')
-          end if
- c
-@@ -658,7 +658,7 @@
-          end if
- c
-          if (msglvl .gt. 0) then
--            call ivout (logfil, 1, nconv, ndigit,
-+            call ivout (logfil, 1, [nconv], ndigit,
-      &           '_naup2: no. of "converged" Ritz values at this iter.')
-             if (msglvl .gt. 1) then
-                kp(1) = nev
-@@ -698,7 +698,7 @@
-          end if
- c
-          if (msglvl .gt. 2) then
--            call ivout (logfil, 1, np, ndigit,
-+            call ivout (logfil, 1, [np], ndigit,
-      &                  '_naup2: The number of shifts to apply ')
-             call zvout  (logfil, np, ritz, ndigit,
-      &                  '_naup2: values of the shifts')
-@@ -762,7 +762,7 @@
-          cnorm = .false.
- c
-          if (msglvl .gt. 2) then
--            call dvout  (logfil, 1, rnorm, ndigit,
-+            call dvout  (logfil, 1, [rnorm], ndigit,
-      &      '_naup2: B-norm of residual for compressed factorization')
-             call zmout  (logfil, nev, nev, h, ldh, ndigit,
-      &        '_naup2: Compressed upper Hessenberg matrix H')
---- SRC/znaupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/znaupd.f	2020-09-24 17:26:05.347777764 +0200
-@@ -601,9 +601,9 @@
-       if (info .eq. 2) info = 3
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, mxiter, ndigit,
-+         call ivout (logfil, 1, [mxiter], ndigit,
-      &               '_naupd: Number of update iterations taken')
--         call ivout (logfil, 1, np, ndigit,
-+         call ivout (logfil, 1, [np], ndigit,
-      &               '_naupd: Number of wanted "converged" Ritz values')
-          call zvout  (logfil, np, workl(ritz), ndigit,
-      &               '_naupd: The final Ritz values')
---- SRC/zneupd.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/zneupd.f	2020-09-24 17:26:05.348777764 +0200
-@@ -536,9 +536,9 @@
- c        %-----------------------------------------------------------%
- c
-          if (msglvl .gt. 2) then
--             call ivout(logfil, 1, numcnv, ndigit,
-+             call ivout(logfil, 1, [numcnv], ndigit,
-      &            '_neupd: Number of specified eigenvalues')
--             call ivout(logfil, 1, nconv, ndigit,
-+             call ivout(logfil, 1, [nconv], ndigit,
-      &            '_neupd: Number of "converged" eigenvalues')
-          end if
- c
---- SRC/zngets.f	2019-01-12 16:24:12.000000000 +0100
-+++ SRC/zngets.f	2020-09-24 17:26:05.348777764 +0200
-@@ -161,8 +161,8 @@
-       tcgets = tcgets + (t1 - t0)
- c
-       if (msglvl .gt. 0) then
--         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
--         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
-+         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
-+         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
-          call zvout (logfil, kev+np, ritz, ndigit,
-      &        '_ngets: Eigenvalues of current H matrix ')
-          call zvout (logfil, kev+np, bounds, ndigit,
diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template
index ce95a267dd8..31b0e790139 100644
--- a/srcpkgs/arpack-ng/template
+++ b/srcpkgs/arpack-ng/template
@@ -1,17 +1,31 @@
 # Template file for 'arpack-ng'
 pkgname=arpack-ng
-version=3.7.0
+version=3.8.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool gcc-fortran pkg-config"
-makedepends="lapack-devel eigen"
+makedepends="eigen"
 short_desc="Collection of Fortran77 subroutines"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/opencollab/arpack-ng"
 changelog="https://raw.githubusercontent.com/opencollab/arpack-ng/master/CHANGES"
 distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"
-checksum=972e3fc3cd0b9d6b5a737c9bf6fd07515c0d6549319d4ffb06970e64fa3cc2d6
+checksum=ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d
+
+# As of 2021-01-03 arpack-ng is only used by octave which includes openblas as
+# its BLAS implementation. So if openblas is available for XBPS_TARGET_MACHINE,
+# use it and if not fall back to regular blas.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 pre_configure() {
 	./bootstrap
@@ -25,8 +39,9 @@ arpack-ng-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
+		vmove usr/include/arpack
+		vmove "usr/lib/*.so"
 	}
 }

From adfe50ac278ad8d5ace09075dd534d04208211bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 7 Jan 2021 05:16:43 +0100
Subject: [PATCH 212/752] icecat: update to 78.6.1

Add ac_add_options --allow-addon-sideload to mozconfig
---
 srcpkgs/icecat/files/mozconfig | 1 +
 srcpkgs/icecat/template        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icecat/files/mozconfig b/srcpkgs/icecat/files/mozconfig
index 31bb6dcd0f2..708ee9eded9 100644
--- a/srcpkgs/icecat/files/mozconfig
+++ b/srcpkgs/icecat/files/mozconfig
@@ -32,3 +32,4 @@ ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
+ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index abdab533f71..450250fe7fd 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,6 +1,6 @@
 # Template file for 'icecat'
 pkgname=icecat
-version=78.6.0
+version=78.6.1
 revision=1
 build_helper="rust qemu"
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
@@ -18,7 +18,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnu.org/software/${pkgname}/"
 distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz"
-checksum=85e85c95cdad245f30b9ef34901552ae1be499191aa409688fee3b67e918c0d1
+checksum=2e4857523a465b39206aa3438e8c799610852ca95c93ae4cb4eb128cd4a28235
 lib32disabled=yes
 
 build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"

From 40b118591add9889453d4e6c762ffba52d871a31 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Jan 2021 11:38:49 -0600
Subject: [PATCH 213/752] melonDS: update to 0.9.1.

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

diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template
index f9c22985922..d5582632f11 100644
--- a/srcpkgs/melonDS/template
+++ b/srcpkgs/melonDS/template
@@ -1,6 +1,6 @@
 # Template file for 'melonDS'
 pkgname=melonDS
-version=0.9
+version=0.9.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -10,5 +10,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=cba0e1966949cd88709be3cd603d85b346e879236b9d51c8c27d7cb12b5a9562
-nopie=yes
+checksum=9c7253a8c9bdd1270c142077eaa3a830176eef42123c72dc68cb1d4abd2d43a6

From ac38e463cef4820aeaff8174add7c907e2848e20 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Jan 2021 16:20:25 +0100
Subject: [PATCH 214/752] bcc: update to 0.18.0.

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

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index a791e8fece4..4a90ecfdc80 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.17.0
-revision=2
+version=0.18.0
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=684cbc5b0b4a19a7fb1993932b9207870cde9ea53653ebe95ab70d58c086bccc
+checksum=d05f2da69545bbb727b929e581c12f6c47729316211899d3734e08f7cff2215b
 python_version="3"
 
 post_extract() {

From cfef36cb59c9f717f8c622460a34e966686db0da Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Jan 2021 16:21:06 +0100
Subject: [PATCH 215/752] mcelog: update to 174.

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

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 190b0b1e860..e9434ac574e 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=173
+version=174
 revision=1
 archs="i686* x86_64*"
 conf_files="/etc/mcelog/mcelog.conf"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.mcelog.org/"
 distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=15b06366527d0958e4f6eb9f11e68533435e989259663625dbffb53dd275b555
+checksum=e326eda0c39926cfce89bad459ca631ecf5b778f1d7064c5fd677a7c5d238b65
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From c15f923ef0274ce8b89d03d8cd34902c957e5cbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Jan 2021 16:28:20 +0100
Subject: [PATCH 216/752] mk-configure: update to 0.36.0.

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

diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index 0c5fdae8c78..dad5f0e0e21 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -1,6 +1,6 @@
 # Template file for 'mk-configure'
 pkgname=mk-configure
-version=0.35.0
+version=0.36.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/cheusov/mk-configure/"
 distfiles="https://github.com/cheusov/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=1a2a61b88cf5a3a80e4a522f8ecfbe51e68c75bedcc9638c15f9637b080a41a8
+checksum=48188e9305b7b1e2f81d3a70e0af1112affa8a7871b01335b86829ffed746177
 disable_parallel_build=yes
 
 post_extract() {

From 49e4b6f78b07b2895886c1c5cedf8e9da3cc940a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Jan 2021 16:29:01 +0100
Subject: [PATCH 217/752] python3-pyinfra: update to 1.3.1.

---
 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 45b0b8eba3f..ef65f2057b5 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3
+version=1.3.1
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=0852337af2a82723c1502b81a1326e59bb1421ae4114242940b779508b8fbb06
+checksum=0ada84e57f2e86be94f0fc259e2d09640dad8c24361cba8de39de18c39564248
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From dd0209a76537ecdc64200b7ef69ec9b1c77b974e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 7 Jan 2021 01:43:31 +0100
Subject: [PATCH 218/752] build-style/void-cross: unify binutils options with
 template a bit

---
 common/build-style/void-cross.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 0e5c2336357..5b9076d7522 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -38,6 +38,17 @@ _void_cross_build_binutils() {
 
 	local ver=$1
 
+	msg_normal "Patching binutils for ${cross_triplet}\n"
+
+	cd ${wrksrc}/binutils-${ver}
+	# enable when crosstoolchains are updated to latest binutils
+	#if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then
+	#	for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do
+	#		_void_cross_apply_patch -p1 "$f"
+	#	done
+	#fi
+	cd ..
+
 	msg_normal "Building binutils for ${cross_triplet}\n"
 
 	mkdir -p ${wrksrc}/binutils_build
@@ -55,9 +66,13 @@ _void_cross_build_binutils() {
 		--disable-multilib \
 		--disable-werror \
 		--disable-gold \
-		--with-system-zlib \
+		--enable-relro \
+		--enable-64-bit-bfd \
 		--enable-deterministic-archives \
 		--enable-default-hash-style=gnu \
+		--with-system-zlib \
+		--with-mmap \
+		--with-pic \
 		${cross_binutils_configure_args}
 
 	make configure-host

From a4f680f2cb258e2c00ae13a6c0e9ed4510c857c9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 7 Jan 2021 01:25:10 +0100
Subject: [PATCH 219/752] binutils: update to 2.35.1

- template is now overhauled
- relro by default
- pic by default (avoids rebuild hack)
- 64-bit bfd can be default
- more reliable target dirs
- default hash style is always set
- build in a separate dir
---
 .../patches/ppc64-revert-gnu-attributes.patch |  86 ++++++++++++
 srcpkgs/binutils/template                     | 123 ++++++++++--------
 2 files changed, 152 insertions(+), 57 deletions(-)
 create mode 100644 srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch

diff --git a/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch b/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch
new file mode 100644
index 00000000000..5de937f4fcc
--- /dev/null
+++ b/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch
@@ -0,0 +1,86 @@
+From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 30 Oct 2020 16:59:48 -0600
+Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
+ libraries"
+
+This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
+---
+ bfd/ChangeLog     | 6 ------
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ChangeLog      | 6 ------
+ ld/ldlang.c       | 9 ++++-----
+ 4 files changed, 4 insertions(+), 20 deletions(-)
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 9fac12538a..b5461494e8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1422,12 +1422,6 @@
+ 	accessing root.u.def of symbols.  Also check root.u.def.section
+ 	is non-NULL.  Reverse tests so as to make the logic positive.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
+-	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	PR 25882
+diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
+index b8b916bfd3..91bb6a10b1 100644
+--- a/bfd/elf32-tic6x.c
++++ b/bfd/elf32-tic6x.c
+@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+ 
+ 	case Tag_ABI_PIC:
+ 	case Tag_ABI_PID:
+-	  /* Don't transfer these tags from dynamic objects.  */
+-	  if ((ibfd->flags & DYNAMIC) != 0)
+-	    continue;
+ 	  if (out_attr[i].i > in_attr[i].i)
+ 	    out_attr[i].i = in_attr[i].i;
+ 	  break;
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 4eec7d2977..b93452f70c 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1319,12 +1319,6 @@
+ 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
+ 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
+-	shared libraries.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* po/BLD-POTFILES.in: Regenerate.
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 9977195074..173d8ec349 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -6972,12 +6972,11 @@ lang_check (void)
+ 		   bfd_printable_name (input_bfd), input_bfd,
+ 		   bfd_printable_name (link_info.output_bfd));
+ 	}
+-
+-      /* If the input bfd has no contents, it shouldn't set the
+-	 private data of the output bfd.  */
+-      else if ((input_bfd->flags & DYNAMIC) != 0
+-	       || bfd_count_sections (input_bfd) != 0)
++      else if (bfd_count_sections (input_bfd))
+ 	{
++	  /* If the input bfd has no contents, it shouldn't set the
++	     private data of the output bfd.  */
++
+ 	  bfd_error_handler_type pfn = NULL;
+ 
+ 	  /* If we aren't supposed to warn about mismatched input
+-- 
+2.29.2
+
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 16826c6bec4..0e6463ad431 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,14 +1,15 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.34
-revision=2
+version=2.35.1
+revision=1
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/binutils/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
+checksum=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+patch_args="-Np1"
 
 makedepends="zlib-devel"
 if [ "$CHROOT_READY" ]; then
@@ -30,73 +31,86 @@ _get_triplet() {
 }
 
 do_configure() {
-	local CONFIGFLAG="--build=$(_get_triplet)
-		--prefix=/usr
-		--enable-threads
-		--enable-plugins
-		--enable-secureplt
-		--with-mmap
-		--disable-shared
-		--enable-gold
-		--disable-werror
-		--enable-deterministic-archives
-		--enable-ld=default
-		--disable-nls"
+	local conf
+
 	if [ "$CHROOT_READY" ]; then
-		CONFIGFLAG+=" --with-debuginfod"
+		conf+=" --with-debuginfod"
 	else
-		CONFIGFLAG+=" --without-debuginfod"
-	fi
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		CONFIGFLAG+=" --enable-64-bit-bfd --enable-multilib"
+		conf+=" --without-debuginfod"
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		# Do not use configure_args nor build_style=gnu-configure,
-		# avoiding --with-sysroot to $XBPS_CROSS_BASE.
-		CONFIGFLAG+=" --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE"
+		# we don't want --with-sysroot=${XBPS_CROSS_BASE} like gnu-configure
+		conf+=" --host=${XBPS_CROSS_TRIPLET} --with-build-sysroot=${XBPS_CROSS_BASE}"
 	fi
-	if [ "$XBPS_TARGET_MACHINE" = "mips-musl" -o "$XBPS_TARGET_MACHINE" = "mipsel-musl" ]; then
-		CONFIGFLAG+=" --with-float=soft --without-fp"
-	fi
-	if [ "${XBPS_TARGET_MACHINE%-musl}" = "x86_64" ]; then
-		CONFIGFLAG+=" --enable-targets=x86_64-pep"
-	elif [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
-		CONFIGFLAG+=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*)
+			conf+=" --enable-secureplt"
+			;;
+		x86_64*)
+			conf+=" --enable-targets=x86_64-pep"
+			;;
+		i686*)
+			conf+=" --enable-targets=x86_64-linux-gnu,x86_64-pep"
+			;;
+	esac
+
+	# enable multilib on x86_64 glibc
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		conf+=" --enable-multilib"
+	else
+		conf+=" --disable-multilib"
 	fi
-	./configure $CONFIGFLAG
+
+	# ensure softfloat on sf mips targets and set the default hash style
+	case "$XBPS_TARGET_MACHINE" in
+		mips*hf*) conf+=" --enable-default-hash-style=sysv" ;;
+		mips*) conf+=" --without-fp --enable-default-hash-style=sysv" ;;
+		*) conf+=" --enable-default-hash-style=gnu";;
+	esac
+
+	mkdir build && cd build
+	../configure --build=$(_get_triplet) \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--disable-werror \
+		--disable-shared \
+		--disable-nls \
+		--enable-threads \
+		--enable-plugins \
+		--enable-relro \
+		--enable-gold \
+		--enable-deterministic-archives \
+		--enable-64-bit-bfd \
+		--enable-ld=default \
+		--with-system-zlib \
+		--with-mmap \
+		--with-pic \
+		$conf
 }
 
 do_build() {
-	make ${makejobs}
-
-	# Rebuild libiberty.a with -fPIC
-	cp -a libiberty libiberty-pic
-	make -C libiberty-pic clean
-	make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
-	# Rebuild libbfd.a with -fPIC
-	# hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-	cp -a bfd bfd-pic
-	make -C bfd-pic clean
-	make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-
-	# Rebuild libopcodes.a with -fPIC
-	cp -a opcodes opcodes-pic
-	make -C opcodes-pic clean
-	make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
+	cd ${wrksrc}/build && make ${makejobs}
 }
 
-# if you enable this later, keep it off for [ -z "$CHROOT_READY" ]
+# there is a testsuite now, but e.g. ifunc tests all fail on musl and
+# also there are other tests that fail on different targets for fairly
+# harmless reasons and it's just too much effort to fix it all
 do_check() {
-	# Seems like upstream forgot to include their new
-	# test-driver executable in their tarball...
-	:
+	[ "$CHROOT_READY" ] || return 0
+	: # cba for now
 }
 
 do_install() {
+	cd ${wrksrc}/build
+
 	local _triplet=$(_get_triplet)
 	make DESTDIR=${DESTDIR} tooldir=/usr install
 
+	cd ..
+
 	# Remove ld (hardlink) and make a symlink to ld.bfd.
 	rm -f ${DESTDIR}/usr/bin/ld
 	ln -sfr ${DESTDIR}/usr/bin/ld.bfd ${DESTDIR}/usr/bin/ld
@@ -105,11 +119,6 @@ do_install() {
 	vinstall include/libiberty.h 644 usr/include
  	vinstall include/demangle.h 644 usr/include
 
-	# install libraries rebuilt with -fPIC
-	vinstall libiberty-pic/libiberty.a 644 usr/lib
- 	vinstall bfd-pic/libbfd.a 644 usr/lib
- 	vinstall opcodes-pic/libopcodes.a 644 usr/lib
-
 	# Remove these symlinks, they are not ABI stable.
 	# Programs should compile static to the .a file.
 	rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so

From 1a53188b4ca5ec46263aa12ff8cda025e91dc68c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 7 Jan 2021 17:04:12 +0100
Subject: [PATCH 220/752] removed-packages: do not replace timidity on glibc

---
 srcpkgs/removed-packages/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ff1327d3238..01bc0c53edf 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=3
+revision=4
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -73,7 +73,6 @@ replaces="
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
- timidity<=2.15.0_1
  ttyload-git<=20141117_4
  tweeny<=2_2
  urlmatch-git<=20141116_2
@@ -86,3 +85,7 @@ replaces="
  wireshark-gtk<=3.0.7_1
  yt-play<=20140117_2
 "
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	replaces+=" timidity<=2.15.0_1"
+fi

From 7e8a2c57959327c29ba30920d651db435a503e2e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 7 Jan 2021 17:09:50 +0100
Subject: [PATCH 221/752] bcc: need libatomic on ppc/mips

---
 srcpkgs/bcc/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 4a90ecfdc80..a0ead1ec73e 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -16,6 +16,10 @@ distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-
 checksum=d05f2da69545bbb727b929e581c12f6c47729316211899d3734e08f7cff2215b
 python_version="3"
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 }

From 7e5b6c458373dd45d5e5a48e15ed51d5b4ab3f10 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 7 Jan 2021 17:27:00 +0100
Subject: [PATCH 222/752] linux5.4: update to 5.4.87.

---
 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 80903901742..5b0b52acfbe 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.86
+version=5.4.87
 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=eb36b5fc6ef7b953acba0a3e62d872e0330c4d34b38d58f5714493a4fe3b0e8b
+checksum=6a34e93e2e84bb645155124962307ad9d3646124f43838d087209ed4ea595c31
 python_version=3
 patch_args="-Np1"
 

From 98b05a283abe3e7535557b13c821d4726d9ef2af Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 7 Jan 2021 17:28:55 +0100
Subject: [PATCH 223/752] linux4.19: update to 4.19.165.

---
 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 08adcdaf89b..de6b8cff724 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.164
+version=4.19.165
 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=e5fa3ab5364d4080cfcf7e0cfb054ade124f20e185fd7809506424dc3c74aaaa
+checksum=a1c05649b0f28d041c34d09d710d2d18f83d42fea4eb90569320d216d4e4e2d0
 python_version=2 #unverified
 patch_args="-Np1"
 

From 692d3fd2a5441c3e196b1098901435caeaafe309 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 7 Jan 2021 18:57:13 +0100
Subject: [PATCH 224/752] filezilla: update to 3.52.0.3.

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

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 56decc86a42..ede40ba6098 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.52.0.1
+version=3.52.0.3
 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=45ac7aba6600d04b4fb38d3769e99fd615d4eccb9233403c3454cafcef656570
+checksum=6dffaca15aa7fd80ec886198e1745088e1893c97639169f7e1c4c254d48a5d9a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From a0a36562d5c93b9e68faa42e553ac788f3b3502a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 7 Jan 2021 19:15:24 +0100
Subject: [PATCH 225/752] smplayer: update to 21.1.0.

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

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 77ca67e0d2b..a92e285d3c9 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=20.6.0
+version=21.1.0
 revision=1
 build_style=gnu-makefile
 build_helper=qmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=be76596b9a0b7079bc41be8f200c1024670bd80ffe9d6ec5f24879519f7ba930
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 

From 12fdf06183fa3ee30b7b662ae252c088fcdad5be Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 7 Jan 2021 20:58:11 +0100
Subject: [PATCH 226/752] texstudio: update to 3.0.4.

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

diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 24dc87f3569..059a4a59e4a 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,6 +1,6 @@
 # Template file for 'texstudio'
 pkgname=texstudio
-version=3.0.3
+version=3.0.4
 revision=1
 build_style=qmake
 configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://texstudio.org/"
 changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt"
 distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz"
-checksum=f301354f8f63c5b92829fd8c212cee0667ff8a2b28328967e65c0a99d2a52238
+checksum=eaa8d67ee5894692c5c39880ab0fcbc4fb42fd5e22242e5c192dfe025a208a36
 
 build_options="phonon poppler"
 desc_option_phonon="build with phonon (=media support for pdf preview)"

From 3c4ef5cb0b876107297d9775c347777a4d793317 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 19:06:03 -0600
Subject: [PATCH 227/752] gcompris-qt: update to 1.0

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

diff --git a/srcpkgs/gcompris-qt/template b/srcpkgs/gcompris-qt/template
index 2270ba15f7a..dfa772f3d02 100644
--- a/srcpkgs/gcompris-qt/template
+++ b/srcpkgs/gcompris-qt/template
@@ -5,9 +5,8 @@
 # Otherwise, they may remove it at a random time.
 #
 pkgname=gcompris-qt
-reverts="0.98_1"
-version=0.97
-revision=2
+version=1.0
+revision=1
 build_style=cmake
 configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0"
 hostmakedepends="extra-cmake-modules kdoctools-devel gettext
@@ -22,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gcompris.net/index-en.html"
 distfiles="https://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"
-checksum=871c6749def44284d0920d11480728db7983a81b348f7e275ef6662b65508342
+checksum=bad9ace08961254c1bfaa64f9df60f1902b3d3aaeb16a527c0e26302010ebc21
 
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then

From aed06a9c2ebb4548fbd0f7984fa529fd740a33d5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 Jan 2021 15:31:52 -0600
Subject: [PATCH 228/752] bpytop: update to 1.0.57.

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

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index 99110c02729..6b0b5474ff4 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.56
+version=1.0.57
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ea1cdc292174cd05fbb17f237a99f8357304c67dfe873297223316c8ca981b7a
+checksum=50978e17d634a53691a78befb9b177a7aa10dae77fd031076e8ac4345ba24c4f
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From 48bc003c4247b609e834091d8e82d456384ab6b4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 Jan 2021 15:36:14 -0600
Subject: [PATCH 229/752] sqlmap: update to 1.5.

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

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

From 0757aed4c719f4a38e2cc2d8dbd24bdf333849be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 7 Jan 2021 22:48:48 +0100
Subject: [PATCH 230/752] removed-packages: remove reintroduced packages from
 list

---
 srcpkgs/removed-packages/template | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 01bc0c53edf..70578abcbde 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=4
+revision=5
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -37,24 +37,17 @@ replaces="
  libdbusmenu-qt<=0.9.2_4
  libgksu<=2.0.12_5
  libqzeitgeist<=0.8.0_6
- libump-git<=20150407_2
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
- lmdb++<=0.9.14.0+20160229_2
  ls++-git<=20140919_3
  mac<=3.99u4b5s7_3
  mdds0<=0.12.1_3
  mongroup<=0.4.1_2
- mtxclient<=0.2.0_3
- nheko<=0.6.2_2
- oksh<=0.5.9_3
- oxygen-icons<=4.14.3_3
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- puddletag<=1.2.0_3
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
@@ -74,10 +67,8 @@ replaces="
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
  ttyload-git<=20141117_4
- tweeny<=2_2
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
- varnish<=6.1.1_3
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16

From 9c459a7ac0e79585ab4e14e3ce3944fe072ef072 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 31 Dec 2020 15:33:14 -0600
Subject: [PATCH 231/752] epson-inkjet-printer-escpr2: update to 1.1.24.

Also remove nocross
---
 srcpkgs/epson-inkjet-printer-escpr2/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 60a87ad3048..afc0ef4c97b 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -1,10 +1,10 @@
 # Template file for 'epson-inkjet-printer-escpr2'
 pkgname=epson-inkjet-printer-escpr2
-version=1.1.22
+version=1.1.24
 revision=1
 archs="x86_64 i686 aarch64 armv7l"
 create_wrksrc=yes
-build_wrksrc=${pkgname}-${version}
+build_wrksrc="${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-cupsfilterdir=/usr/lib/cups/filter --with-cupsppddir=/usr/share/ppd"
 hostmakedepends="automake rpmextract "
@@ -13,9 +13,8 @@ short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="custom:Proprietary"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-distfiles="https://download3.ebz.epson.net/dsc/f/03/00/12/02/82/a2b1cbcb5138ebca303987e685d76263c0c25e5e/${pkgname}-${version}-1lsb3.2.src.rpm"
-checksum=797c9ead379f5cbba399eaeff631e09faf1b46a9cd7a52c5dfe30481d5b7481e
-nocross="configure: error: cannot run C compiled programs"
+distfiles="https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/${pkgname}-${version}-1lsb3.2.src.rpm"
+checksum=0cfce328ab1359b7c393532c54f5cdb0ee43ec2fd188d7a09b0ab6b04331d9ca
 restricted=yes
 repository=nonfree
 

From 8d0eaac09b52d07e690e41a0608ead9a9cb90587 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 03:48:29 -0600
Subject: [PATCH 232/752] olm: update to 3.2.1.

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

diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template
index 62fd5a09164..39aabed41d3 100644
--- a/srcpkgs/olm/template
+++ b/srcpkgs/olm/template
@@ -1,6 +1,6 @@
 # Template file for 'olm'
 pkgname=olm
-version=3.1.5
+version=3.2.1
 revision=1
 build_style=cmake
 short_desc="Implementation of the Double Ratchet cryptographic ratchet"
@@ -8,7 +8,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=1cd4d92ae56373836362c3300ee79a14005a26cda3d399d278d468ba5c7c0713
+checksum=a0482f8c8e80eb11578e8a8655b677fe943b86ac33affd46d67dff4261afeb6a
 
 do_check() {
 	cd build/tests

From 169c763429acb2d9a02ff750cd2baffe788f2a6f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 5 Jan 2021 16:10:26 -0600
Subject: [PATCH 233/752] olm-python3: update to 3.2.1.

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

diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template
index 80c75317452..2ac1d725ac7 100644
--- a/srcpkgs/olm-python3/template
+++ b/srcpkgs/olm-python3/template
@@ -1,20 +1,25 @@
 # Template file for 'olm-python3'
 pkgname=olm-python3
-version=3.1.5
-revision=3
+version=3.2.1
+revision=1
 wrksrc="olm-${version}"
 build_wrksrc=python
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"
 makedepends="python3-devel libffi-devel olm-devel"
 depends="python3-cffi python3-future"
+checkdepends="python3-pytest python3-future"
 short_desc="Implementation of the Double Ratchet cryptographic ratchet - Python"
 maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=1cd4d92ae56373836362c3300ee79a14005a26cda3d399d278d468ba5c7c0713
+checksum=a0482f8c8e80eb11578e8a8655b677fe943b86ac33affd46d67dff4261afeb6a
 
 pre_build() {
 	make include/olm/olm.h
 }
+
+do_check() {
+	PYTHONPATH=$(cd build/lib.linux-* && pwd) python3 -m pytest
+}

From 76aee10b314fee82ee84dfc0e66c62ba5bb0519d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 28 Dec 2020 09:03:11 -0600
Subject: [PATCH 234/752] ipv6calc: update to 3.0.0.

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

diff --git a/srcpkgs/ipv6calc/template b/srcpkgs/ipv6calc/template
index cc4278c1fc5..022e15fc271 100644
--- a/srcpkgs/ipv6calc/template
+++ b/srcpkgs/ipv6calc/template
@@ -1,7 +1,7 @@
 # Template file for 'ipv6calc'
 pkgname=ipv6calc
-version=2.2.0
-revision=2
+version=3.0.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-geoip --enable-mmdb --enable-external"
 hostmakedepends="perl"
@@ -11,6 +11,6 @@ maintainer="Lon Willett <xgit@lonw.net>"
 license="GPL-2.0-only"
 homepage="https://www.deepspace6.net/projects/ipv6calc.html"
 distfiles="https://github.com/pbiering/ipv6calc/archive/${version}.tar.gz"
-checksum=1935352f6171b07f18ce0487ee95ffcc006ea3f653f7cba564d2d8e135f04ca1
+checksum=8728a823709bc39c7aecd29ee19508816accbaa27dfd15933fe1fa2e2cf1fcd7
 
 CFLAGS="-fcommon"

From 5f8baa63ec81a999436e947b03ae2de608e51ace Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 22:40:39 +0100
Subject: [PATCH 235/752] xorg-server: unconditionally use libtirpc.

---
 srcpkgs/xorg-server/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 5e48034444e..06f51d611e8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.10
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
@@ -41,12 +41,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -Dint10=false -Dvbe=false" ;;
 esac
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-	# required when secure_rpc is enabled and not using glibc for rpc/rpc.h
-	makedepends+=" libtirpc-devel" ;;
-esac
-
 # gcc10 needs to be hinted when symbols have multiple definitions
 CFLAGS="-fcommon"
 

From 5b58747b05c795b50a9e1a10d9881dcf1baf9f73 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 22:46:26 +0100
Subject: [PATCH 236/752] conntrack-tools: unconditionally use libtirpc.

---
 srcpkgs/conntrack-tools/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/conntrack-tools/template b/srcpkgs/conntrack-tools/template
index 40314c29acb..2d0773538fb 100644
--- a/srcpkgs/conntrack-tools/template
+++ b/srcpkgs/conntrack-tools/template
@@ -1,20 +1,15 @@
 # Template file for 'conntrack-tools'
 pkgname=conntrack-tools
 version=1.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config flex"
-makedepends="libnfnetlink-devel libnetfilter_conntrack-devel libnetfilter_cttimeout-devel libnetfilter_cthelper-devel libnetfilter_queue-devel libmnl-devel"
+makedepends="libmnl-devel libnetfilter_conntrack-devel
+ libnetfilter_cthelper-devel libnetfilter_cttimeout-devel
+ libnetfilter_queue-devel libnfnetlink-devel libtirpc-devel"
 short_desc="Tools to interact with the netfilter connection tracking system"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-or-later"
 homepage="http://conntrack-tools.netfilter.org/"
 distfiles="http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${version}.tar.bz2"
 checksum=590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libtirpc-devel"
-		CFLAGS="-D_GNU_SOURCE -I${XBPS_CROSS_BASE}/usr/include/tirpc"
-		LDFLAGS="-ltirpc"
-		;;
-esac

From 9ded5b2a95203fe72213d5f54b1f8597f4bcc3b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 23:00:04 +0100
Subject: [PATCH 237/752] libvirt: use rpcsvc-proto unconditionally.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 09255adbda3..b4978fae705 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,11 +1,12 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=6.10.0
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
-hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
- iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext"
+hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables
+ libapparmor-devel libtool libxslt lvm2 parted perl pkg-config python3-docutils
+ rpcsvc-proto"
 makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel
  libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel
  device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel
@@ -31,10 +32,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
-		hostmakedepends+=" rpcsvc-proto"
-		;;
+	*-musl) ;;
 	*)
 		# LTO apparently causes the linker to confuse the glibc symbol
 		# xdr_int64_t with that provided by libtirpc, causing a crash.

From 67ec3dea4e299b0b31ac13c33c2f7ffa7e4fd899 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:14:20 +0100
Subject: [PATCH 238/752] glusterfs: use rpcsvc-proto

glibc-2.23 doesn't provide rpcgen anymore
---
 srcpkgs/glusterfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index a02e318f7a5..97cf36dd9e1 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -7,7 +7,7 @@ configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
-hostmakedepends="automake flex libtool pkg-config python3"
+hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
 makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.

From 2fde508c5dee4a5406df775793b1ba35ba857dfa Mon Sep 17 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, 7 Jan 2021 21:29:06 +0700
Subject: [PATCH 239/752] w3m: update to 0.5.3+git20210102.

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

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index f2452987789..6c42a09ff1f 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,7 +1,7 @@
 # Template file for 'w3m'
 pkgname=w3m
-version=0.5.3+git20200502
-revision=3
+version=0.5.3+git20210102
+revision=1
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://tracker.debian.org/pkg/w3m"
 changelog="https://raw.githubusercontent.com/tats/w3m/master/NEWS"
 distfiles="https://github.com/tats/w3m/archive/v$version.tar.gz"
-checksum=bfc3d076be414b76352fa487d67b0b2aa9e400aafe684e2eb66d668a1597141c
+checksum=7b276d2c6ee96588f990959a01e0d8979b1b8c86fdb04d0d17ef46c30c2cd884
 
 LDFLAGS="-lX11"
 
@@ -39,6 +39,11 @@ pre_build() {
 	fi
 }
 
+do_check() {
+	cd tests
+	sh run_tests
+}
+
 post_install() {
 	local _file
 	vlicense doc/README

From a7c9fda34e915430638577ef4332287c85312866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 7 Jan 2021 06:18:07 +0100
Subject: [PATCH 240/752] exiftool: update to 12.14.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 3fb42f98d5e..08daf214fcc 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.13
+version=12.14
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -13,4 +13,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=16c26ea078f432d12bbc38aaff24c279a58698c006fb3e27261070573860174f
+checksum=c1682bd467b0cfb3a385cfe17e413e33a15070d4fe55b82f0302ca47f42341a4

From 93b8ba5eeca3a44274721922f702d58c0eddf221 Mon Sep 17 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, 7 Jan 2021 07:23:44 +0700
Subject: [PATCH 241/752] nss: update to 3.60.1.

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

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index d0afe409efc..b203db3b956 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.60
+version=3.60.1
 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=84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d
+checksum=2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From ee934b87f7d9262e470c6e339df38e6c4666c9a5 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Wed, 6 Jan 2021 14:12:47 +0100
Subject: [PATCH 242/752] evolution: remove deprecated dependency gtkhtml

Close: #27714
---
 srcpkgs/evolution/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 77cfb0bd126..103eaa8383a 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,14 +1,14 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.38.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
  -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
 hostmakedepends="gobject-introspection intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
- evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel
+ evolution-data-server-devel gspell-devel libcanberra-devel
  libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
  gnome-desktop-devel"
 depends="gnome-keyring"
@@ -29,7 +29,7 @@ fi
 
 evolution-devel_package() {
 	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel
-	 gtkhtml-devel ${sourcepkg}>=${version}_${revision}"
+	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 533155dcbc72c42b1f32a457e96e1771a9b9804e Mon Sep 17 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, 7 Jan 2021 21:03:12 +0700
Subject: [PATCH 243/752] gtkhtml: remove package

---
 common/shlibs                                |  2 --
 srcpkgs/gtkhtml-devel                        |  1 -
 srcpkgs/gtkhtml/patches/fix-test-suite.patch | 11 ------
 srcpkgs/gtkhtml/template                     | 37 --------------------
 srcpkgs/libgtkhtml                           |  1 -
 srcpkgs/removed-packages/template            |  5 ++-
 6 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 120000 srcpkgs/gtkhtml-devel
 delete mode 100644 srcpkgs/gtkhtml/patches/fix-test-suite.patch
 delete mode 100644 srcpkgs/gtkhtml/template
 delete mode 120000 srcpkgs/libgtkhtml

diff --git a/common/shlibs b/common/shlibs
index a60e1becef3..bfffb675aea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1007,8 +1007,6 @@ libIcePatch2.so.35 libIce-3.5.0_1
 libIceDB.so.35 libIce-3.5.0_1
 libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
-libgtkhtml-4.0.so.0 libgtkhtml-4.2.1_1
-libgtkhtml-editor-4.0.so.0 libgtkhtml-4.2.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1
diff --git a/srcpkgs/gtkhtml-devel b/srcpkgs/gtkhtml-devel
deleted file mode 120000
index 81f1e9464ca..00000000000
--- a/srcpkgs/gtkhtml-devel
+++ /dev/null
@@ -1 +0,0 @@
-gtkhtml
\ No newline at end of file
diff --git a/srcpkgs/gtkhtml/patches/fix-test-suite.patch b/srcpkgs/gtkhtml/patches/fix-test-suite.patch
deleted file mode 100644
index ffa14b2ffbb..00000000000
--- a/srcpkgs/gtkhtml/patches/fix-test-suite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtkhtml/test-suite.c	2013-12-13 22:58:34.000000000 +0100
-+++ gtkhtml/test-suite.c	2018-03-10 20:06:41.119449731 +0100
-@@ -545,7 +545,7 @@
- 	flow_levels = HTML_CLUEFLOW (HTML_CLUE (HTML_CLUE (e->clue)->head)->head)->levels;
- 
- 	/* test if levels are OK */
--	if (!flow_levels || !flow_levels->len == 1 || flow_levels->data[0] != HTML_LIST_TYPE_BLOCKQUOTE_CITE)
-+	if (!flow_levels || flow_levels->len != 1 || flow_levels->data[0] != HTML_LIST_TYPE_BLOCKQUOTE_CITE)
- 		return FALSE;
- 
- 	return TRUE;
diff --git a/srcpkgs/gtkhtml/template b/srcpkgs/gtkhtml/template
deleted file mode 100644
index 63055bd304a..00000000000
--- a/srcpkgs/gtkhtml/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'gtkhtml'
-pkgname=gtkhtml
-version=4.10.0
-revision=1
-build_style=gnu-configure
-make_build_args="V=1"
-hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel enchant-devel ORBit2-devel
- libsoup-gnome-devel gsettings-desktop-schemas-devel
- gsettings-desktop-schemas iso-codes"
-depends="gsettings-desktop-schemas iso-codes"
-short_desc="Layout engine written in C using the GTK+ widget toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.gnome.org"
-license="GPL-2"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" glib-devel"
-fi
-
-libgtkhtml_package() {
-	short_desc+=" - runtime libraries"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
-}
-gtkhtml-devel_package() {
-	depends="libgtkhtml>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libgtkhtml b/srcpkgs/libgtkhtml
deleted file mode 120000
index 81f1e9464ca..00000000000
--- a/srcpkgs/libgtkhtml
+++ /dev/null
@@ -1 +0,0 @@
-gtkhtml
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 70578abcbde..e07c160eafe 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=5
+revision=6
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -30,6 +30,9 @@ replaces="
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
  grv<=0.3.1_3
+ gtkhtml<=4.10.0_1
+ gtkhtml-devel<=4.10.0_1
+ libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
  isl16<=0.16_2
  keepassx<=0.4.4_2

From ae1ea61053d0293e793785b82e7473c5c7dd1071 Mon Sep 17 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, 8 Jan 2021 07:26:22 +0700
Subject: [PATCH 244/752] openjpeg2: update to 2.4.0.

---
 srcpkgs/openjpeg2/patches/CVE-2020-6851.patch | 29 -------------
 srcpkgs/openjpeg2/patches/CVE-2020-8112.patch | 43 -------------------
 srcpkgs/openjpeg2/template                    |  7 +--
 3 files changed, 4 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/openjpeg2/patches/CVE-2020-6851.patch
 delete mode 100644 srcpkgs/openjpeg2/patches/CVE-2020-8112.patch

diff --git a/srcpkgs/openjpeg2/patches/CVE-2020-6851.patch b/srcpkgs/openjpeg2/patches/CVE-2020-6851.patch
deleted file mode 100644
index 9a70291f50e..00000000000
--- a/srcpkgs/openjpeg2/patches/CVE-2020-6851.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 11 Jan 2020 01:51:19 +0100
-Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
- coordinates are beyond INT_MAX (fixes #1228)
-
----
- src/lib/openjp2/j2k.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
-index 14f6ff41a..922550eb1 100644
---- a/src/lib/openjp2/j2k.c
-+++ b/src/lib/openjp2/j2k.c
-@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
-     l_img_comp = p_image->comps;
-     for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
-         OPJ_INT32 l_h, l_w;
-+        if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
-+                p_image->y0 > (OPJ_UINT32)INT_MAX ||
-+                p_image->x1 > (OPJ_UINT32)INT_MAX ||
-+                p_image->y1 > (OPJ_UINT32)INT_MAX) {
-+            opj_event_msg(p_manager, EVT_ERROR,
-+                          "Image coordinates above INT_MAX are not supported\n");
-+            return OPJ_FALSE;
-+        }
- 
-         l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
-                          (OPJ_INT32)l_img_comp->dx);
diff --git a/srcpkgs/openjpeg2/patches/CVE-2020-8112.patch b/srcpkgs/openjpeg2/patches/CVE-2020-8112.patch
deleted file mode 100644
index 95cb8095f56..00000000000
--- a/srcpkgs/openjpeg2/patches/CVE-2020-8112.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 30 Jan 2020 00:59:57 +0100
-Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
-
-That could lead to later assertion failures.
-
-Fixes #1231 / CVE-2020-8112
----
- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
-index deecc4dff..aa419030a 100644
---- a/src/lib/openjp2/tcd.c
-+++ b/src/lib/openjp2/tcd.c
-@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
-             /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-             l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
-             l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
--            l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
--            l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
-+            {
-+                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
-+                                  (OPJ_INT32)l_pdx)) << l_pdx;
-+                if (tmp > (OPJ_UINT32)INT_MAX) {
-+                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+                    return OPJ_FALSE;
-+                }
-+                l_br_prc_x_end = (OPJ_INT32)tmp;
-+            }
-+            {
-+                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
-+                                  (OPJ_INT32)l_pdy)) << l_pdy;
-+                if (tmp > (OPJ_UINT32)INT_MAX) {
-+                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+                    return OPJ_FALSE;
-+                }
-+                l_br_prc_y_end = (OPJ_INT32)tmp;
-+            }
-             /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
- 
-             l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template
index b3c68d10e9c..372fb65370b 100644
--- a/srcpkgs/openjpeg2/template
+++ b/srcpkgs/openjpeg2/template
@@ -1,16 +1,17 @@
 # Template file for 'openjpeg2'
 pkgname=openjpeg2
-version=2.3.1
-revision=3
+version=2.4.0
+revision=1
 wrksrc="openjpeg-${version}"
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None"
 makedepends="libpng-devel lcms2-devel tiff-devel"
 short_desc="Open-source JPEG 2000 codec written in C language (Version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://www.openjpeg.org/"
 distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
-checksum=63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9
+checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
 patch_args="-Np1"
 
 post_install() {

From 5fab926a9c50b9065d5cedfa9d764812253942df Mon Sep 17 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, 8 Jan 2021 08:37:48 +0700
Subject: [PATCH 245/752] libvaladoc: depends on vala explicitly

Otherwise, xbps-install complains about unresolved shlib.
---
 srcpkgs/valadoc/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 04f1f2824da..4593b7db5f6 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -2,7 +2,7 @@
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
 version=0.50.0
-revision=2
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -31,6 +31,7 @@ do_install() {
 
 libvaladoc_package() {
 	short_desc+=" - shared library"
+	depends="vala>=${version}"
 	pkg_install() {
 		vmove "usr/lib/libvaladoc-*.so.*"
 		vmove "usr/lib/valadoc-${version%.*}"

From e04209a68d8a378d58b6978a4977761c72f13234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 23 Dec 2020 12:58:19 +0100
Subject: [PATCH 246/752] rustup: update to 1.23.1.

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

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 6472ae1f10c..279c30e2dae 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,9 @@
 # Template file for 'rustup'
 pkgname=rustup
-version=1.22.1
-revision=2
+version=1.23.1
+revision=1
+# rustup doesn't recognize this target
+archs="~armv6l-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
@@ -12,28 +14,24 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"
 homepage="https://www.rustup.rs"
 distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=ad46cc624f318a9493aa62fc9612a450564fe20ba93c689e0ad856bff3c64c5b
+checksum=0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f
 
 post_build() {
-	# rustup errors out because it doesn't know about armv6l-musl
-	if [ "$XBPS_TARGET_MACHINE" != armv6l-musl ]; then
-		RUSTUP="target/${RUST_TARGET}/release/rustup-init"
-		ln -sf "$RUSTUP" rustup
-		# generate shell completions
-		vtargetrun ./rustup completions zsh >rustup.zsh
-		vtargetrun ./rustup completions bash >rustup.bash
-		vtargetrun ./rustup completions fish >rustup.fish
-	fi
+	RUSTUP="target/${RUST_TARGET}/release/rustup-init"
+	ln -sf "$RUSTUP" rustup
+
+	# generate shell completions
+	vtargetrun ./rustup completions zsh >rustup.zsh
+	vtargetrun ./rustup completions bash >rustup.bash
+	vtargetrun ./rustup completions fish >rustup.fish
 }
 
 do_install() {
 	vbin target/${RUST_TARGET}/release/rustup-init
 
-	if [ "$XBPS_TARGET_MACHINE" != armv6l-musl ]; then
-		vcompletion rustup.bash bash
-		vcompletion rustup.fish fish
-		vcompletion rustup.zsh zsh
-	fi
+	vcompletion rustup.bash bash
+	vcompletion rustup.fish fish
+	vcompletion rustup.zsh zsh
 
 	vdoc README.md
 	vlicense LICENSE-APACHE

From 63a12bae48cf5ce58a37c6613709ffe81ec43fa6 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 8 Jan 2021 09:56:29 +0100
Subject: [PATCH 247/752] libpcap: update to 1.10.0.

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

diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index e0d42dfa0a1..c7b13b3ce9b 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libpcap'
 pkgname=libpcap
-version=1.9.1
+version=1.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-libnl --with-pcap=linux
@@ -13,7 +13,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="BSD-3-Clause"
 homepage="https://www.tcpdump.org/"
 distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
-checksum=635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
+checksum=8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e
 
 build_options="bluetooth dbus usb"
 build_options_default="usb"

From 5f4141a67b3bd4118bbff3ad6be86eb745e3033c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 8 Jan 2021 09:56:33 +0100
Subject: [PATCH 248/752] tcpdump: update to 4.99.0.

remove td_cv_buggygetaddrinfo, it's obsolete since 2015
tcpdump/11f73ad248fa22461ca040baa8dc94b864509efa
---
 .../patches/tcpdump_duplicate_executable.patch     | 14 +++++++-------
 srcpkgs/tcpdump/template                           |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch b/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch
index 4d64cacd0f7..90b33f0ac28 100644
--- a/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch
+++ b/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch
@@ -1,10 +1,10 @@
---- Makefile.in	2012-06-12 18:56:20.000000000 +0200
-+++ Makefile.in	2012-06-13 08:41:09.000000000 +0200
-@@ -409,7 +409,6 @@
- 	[ -d $(DESTDIR)$(sbindir) ] || \
- 	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
- 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
--	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION`
+--- Makefile.in
++++ Makefile.in
+@@ -420,7 +420,6 @@
+ 	[ -d $(DESTDIR)$(bindir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+ 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG)
+-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG).`cat ${srcdir}/VERSION`
  	[ -d $(DESTDIR)$(mandir)/man1 ] || \
  	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
  	$(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index dd482497d6e..aea1e1a91e5 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,16 +1,16 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
-version=4.9.3
-revision=2
+version=4.99.0
+revision=1
 build_style=gnu-configure
-configure_args="td_cv_buggygetaddrinfo=no"
 makedepends="libpcap-devel libressl-devel"
+checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.tcpdump.org"
 distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
-checksum=2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410
+checksum=8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842
 
 post_install() {
 	vlicense LICENSE

From be1f546f0c1ee12ee3d00311d8309844019f8dc0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 8 Jan 2021 10:31:10 +0100
Subject: [PATCH 249/752] xarchiver: update to 0.5.4.16.

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

diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index 92786bd2c7f..240779473e9 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,7 +1,7 @@
 # Template file for 'xarchiver'
 pkgname=xarchiver
-version=0.5.4.15
-revision=2
+version=0.5.4.16
+revision=1
 build_style=gnu-configure
 configure_args="--disable-doc --enable-gtk2=no"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ib/xarchiver"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=2a18f5a8932516ecc5c50152ff6ce77bc3f58a0b221d6db9c70d089cf90d7182
+checksum=d31f301d66b77d47e0a40e13e2542d19b30649aff5e7254045baaf4b09cd38b6

From 3a283abbbc3ace46459c34127ca25b2679f7a6bb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 8 Jan 2021 22:16:05 +1100
Subject: [PATCH 250/752] rustup: broken on all arm-musl.

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

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 279c30e2dae..5890c26c1f5 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,9 +1,9 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
-archs="~armv6l-musl"
+archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"

From d8268ff415d3407d638e96ea98e22474ae0ed7e0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 Jan 2021 16:12:49 -0600
Subject: [PATCH 251/752] spotify-tui: update to 0.23.0.

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

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index a7bf097c2b6..1c027e542e2 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
-version=0.22.0
+version=0.23.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/Rigellute/spotify-tui"
 distfiles="https://github.com/Rigellute/spotify-tui/archive/v${version}.tar.gz"
-checksum=3bac0ca34db6b71721af66ba423cea59780c43410bfb52d870198facc6a6a906
+checksum=836a686c78599431b7e4dcf4a2830d16b25d28bdc4f35d79f0d5e8c000788da7
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.58

From b8d9253ddbae60af988d1751d55b33e01a129b85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Jan 2021 16:01:49 +0100
Subject: [PATCH 252/752] zutils: update to 1.10.

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

diff --git a/srcpkgs/zutils/template b/srcpkgs/zutils/template
index 8999be27760..8549ede01b5 100644
--- a/srcpkgs/zutils/template
+++ b/srcpkgs/zutils/template
@@ -1,6 +1,6 @@
 # Template file for 'zutils'
 pkgname=zutils
-version=1.9
+version=1.10
 revision=1
 build_style=gnu-configure
 hostmakedepends="lzip"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/zutils/zutils.html"
 distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.lz"
-checksum=59d83cb129788528d311a0bb686e40986c6941b1ad90edc20a91878c39aa5c78
+checksum=0dd44138292d5757648037195b6945c3df70b316221b4285520ad38f2eaeb195
 
 post_install() {
 	cd ${DESTDIR}/usr/bin

From 2f876d82a74e7863f205dd5a2bbdc9c31420cd92 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Jan 2021 16:03:46 +0100
Subject: [PATCH 253/752] perl-LWP: update to 6.52.

---
 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 c2f19c8813c..354150158ec 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.51
+version=6.52
 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=6444154f5c2b410627de2e73cc70e48a181e857c8fb4ffce29e4bdef60b8f9a3
+checksum=b63f67647b7cfb0bace19ada32e4feb2c2e8e0f4204546c62ce6247fa59d778d

From 56855bbc4e3a34f87b9830c7b3433d69840c8dab Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Jan 2021 16:05:27 +0100
Subject: [PATCH 254/752] nncp: update to 5.5.0.

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

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

From e26f6916e33153d60d0abf250f17f3b1430fea17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Jan 2021 16:06:34 +0100
Subject: [PATCH 255/752] ganv: update to 1.8.0.

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

diff --git a/srcpkgs/ganv/template b/srcpkgs/ganv/template
index 5109a207638..cd9fd2d01c0 100644
--- a/srcpkgs/ganv/template
+++ b/srcpkgs/ganv/template
@@ -1,6 +1,6 @@
 # Template file for 'ganv'
 pkgname=ganv
-version=1.6.0
+version=1.8.0
 revision=1
 build_style=waf3
 hostmakedepends="glib-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://drobilla.net/software/ganv/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=d46075c49142925ecd04419a0727aa035eed8ad4902c2899cce097944613335e
+checksum=da81271f930dfeaeb863c45dcff9ffc3175e1739ff1c7ae674c20b89f1ba8013
 
 CXXFLAGS="-std=c++11"
 

From 6d958a1adb7b01c2ea23a1e4f323700bacbc0d65 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Jan 2021 16:08:09 +0100
Subject: [PATCH 256/752] patchage: update to 1.0.4.

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

diff --git a/srcpkgs/patchage/template b/srcpkgs/patchage/template
index 328c8795916..e92bdf77c95 100644
--- a/srcpkgs/patchage/template
+++ b/srcpkgs/patchage/template
@@ -1,6 +1,6 @@
 # Template file for 'patchage'
 pkgname=patchage
-version=1.0.2
+version=1.0.4
 revision=1
 build_style=waf3
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://drobilla.net/software/patchage"
 distfiles="https://download.drobilla.net/patchage-${version}.tar.bz2"
-checksum=c6eb9558f3de0968396744241e053b843d7fbe37020cad791da882c054746336
+checksum=7c27fe3ad3d34aa273915df94dee3cacfc632bae59eb3bfc5e6fc63a789c6a3d

From fed916c59f175c0ea3c0fdcd114ea6d23f9d9985 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 09:51:09 -0500
Subject: [PATCH 257/752] python3-h11: update to 0.12.0.

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

diff --git a/srcpkgs/python3-h11/template b/srcpkgs/python3-h11/template
index 989b224557f..afb9e2f4a68 100644
--- a/srcpkgs/python3-h11/template
+++ b/srcpkgs/python3-h11/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-h11'
 pkgname=python3-h11
-version=0.11.0
+version=0.12.0
 revision=1
 wrksrc=h11-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Bring-your-own-I/O implementation of HTTP/1.1 (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/python-hyper/h11"
 distfiles="https://github.com/python-hyper/h11/archive/v${version}.tar.gz"
-checksum=901da350dc69a9e54e942a23dace7040aa0b0789be9ed5210407efe0159856e2
+checksum=147a8a1243e55be496823109067f4ebafb449fd3c9dfd7c12526f133547c0138
 
 post_install() {
 	vlicense LICENSE.txt

From f0c2c986d3e8e3dcc5ed9b1694d74e55007ac3fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 09:51:57 -0500
Subject: [PATCH 258/752] python3-prompt_toolkit: update to 3.0.10.

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

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index b76f908cca1..fcb29f44326 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.9
+version=3.0.10
 revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="Python3 library for building powerful interactive command lines"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 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=c5eeab58dd31b541442825d7870777f2a2f764eb5fda03334d5219cd84b9722f
+checksum=b8b3d0bde65da350290c46a8f54f336b3cbf5464a4ac11239668d986852e79d5
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 4cb58ab6648aab404829cdff2ac120bb3f535ef5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 09:54:23 -0500
Subject: [PATCH 259/752] python3-breathe: update to 4.26.0.

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

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index 0f9476337d5..d81bb40c7df 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.25.1
+version=4.26.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb95b51a8e98a1bf9033fdb757e7a255e853eab9ef83b23cb2818a2b8e25b914
+checksum=5b03a3576eaf49ef2816996c77cfae3dcad0d5c48c9a8aa2bc62e72989a2a1f5
 
 post_install() {
 	vlicense LICENSE

From f5b78f4b042a7faeef3be271c0f118ceaecbea13 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 10:02:39 -0500
Subject: [PATCH 260/752] python3-hypothesis: update to 5.49.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 13e115d96de..1a5c4de03b2 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=5.46.0
+version=5.49.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=52581371c58321c69766cafb2ad375b3676bdf4107d02b9127a0e99d7baec94b
+checksum=b756a941014df75f772d01cc4fde4383c8dabc6db95f32cce094012f576f6762
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From b640ecc049f02603c97d72f6b206dbb9a64b24fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 10:18:46 -0500
Subject: [PATCH 261/752] cpp-utilities: update to 5.10.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 53dea88b6dd..a833b0ddd56 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.9.0
+version=5.10.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=88647cb246f502771ad42e955d7657c279fa19082d1ef2d538ccdfcd4dd2002e
+checksum=a0eed2901eff3785bec7e8395f427c8fe206af75960ca628f5fe277043e5c0ed
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From f054935769aa59f4c9096efd6cff607f0d3d84b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 10:18:49 -0500
Subject: [PATCH 262/752] qtutilities: update to 6.3.3.

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

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

From c4ca5b2b4b10eac72d4f6f1a8007c8462a5e031d Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Fri, 8 Jan 2021 14:09:36 +0100
Subject: [PATCH 263/752] alacritty: update to 0.7.0.

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

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index ae9db685ca2..673e345a348 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.6.0
+version=0.7.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c794125a900a6477f1b40168dc9d22674a5326f32e4b083d6f1a45486d2505bf
+checksum=b9b7e96ebc1725962de628dac7d7bc0766ff9aea5f4c09f399e95823369d5882
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From e4d24d9402b0087967d702dfdb27e858c5bc24d9 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 8 Jan 2021 15:07:19 +0100
Subject: [PATCH 264/752] cups-filters: update to 1.28.7

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

diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 1d32e017809..a135bc3a76e 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,6 +1,6 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.28.6
+version=1.28.7
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
-checksum=756b433cac3718e492d1da58859461862ec70bd863dbd2d4d221ab724f145f6c
+checksum=e4150902809c58dfff7089c9345f196ecd88e38bce2be4800fa4811a0902057d
 lib32disabled=yes
 
 post_install() {

From 24666b134ed39615616d6baf7509a158a2f06f9d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 8 Jan 2021 12:08:36 +0100
Subject: [PATCH 265/752] fluidsynth: update to 2.1.6 enable checks

Closes: #27758 [via git-merge-pr]
---
 srcpkgs/fluidsynth/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index d6c8214cfb4..53e299a1d66 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.1.5
+version=2.1.6
 revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
@@ -12,7 +12,12 @@ 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=b539b7c65a650b56f01cd60a4e83c6125c217c5a63c0c214ef6274894a677d00
+checksum=328fc290b5358544d8dea573f81cb1e97806bdf49e8507db067621242f3f0b8a
+
+do_check() {
+	cd build
+	make check
+}
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 9bfee1e71fd96533e6f7f49634aa8c93391e5b58 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Jan 2021 10:59:55 +0200
Subject: [PATCH 266/752] lzlib: update to 1.12.

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

diff --git a/srcpkgs/lzlib/template b/srcpkgs/lzlib/template
index 1e4f64f2045..06b29b4a7e7 100644
--- a/srcpkgs/lzlib/template
+++ b/srcpkgs/lzlib/template
@@ -1,6 +1,6 @@
 # Template file for 'lzlib'
 pkgname=lzlib
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-static"
@@ -9,7 +9,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-2-Clause"
 homepage="https://www.nongnu.org/lzip/lzlib"
 distfiles="${NONGNU_SITE}/lzip/lzlib/${pkgname}-${version}.tar.gz"
-checksum=6c5c5f8759d1ab7c4c3c53788ea2d9daad04aeddcf338226893f8ff134914d36
+checksum=8e5d84242eb52cf1dcc98e58bd9ba8ef1aefa501431abdd0273a22bf4ce337b1
 
 do_configure() {
 	./configure --prefix=/usr $configure_args CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"

From c2c15eef39141791b6067b23f9e9c51f3e0bd060 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Jan 2021 11:00:00 +0200
Subject: [PATCH 267/752] plzip: update to 1.9.

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

diff --git a/srcpkgs/plzip/template b/srcpkgs/plzip/template
index 631e96fe1c6..145bf8179ce 100644
--- a/srcpkgs/plzip/template
+++ b/srcpkgs/plzip/template
@@ -1,6 +1,6 @@
 # Template file for 'plzip'
 pkgname=plzip
-version=1.8
+version=1.9
 revision=1
 build_style=gnu-configure
 makedepends="lzlib-devel"
@@ -9,7 +9,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/lzip/plzip"
 distfiles="${NONGNU_SITE}/lzip/plzip/${pkgname}-${version}.tar.gz"
-checksum=edafae3c15142ac0ebd84c2231ff81da4f68db58359a737e750f2780686c3612
+checksum=14d8d1db8dde76bdd9060b59d50b2943417eb4c0fbd2b84736546b78fab5f1a7
 
 do_configure() {
 	./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"

From b61da8b1eabe6328093fdf0f51a21494f9a0f082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 20 Dec 2020 16:53:13 +0100
Subject: [PATCH 268/752] dua-cli: update to 2.10.9.

Closes: #27749 [via git-merge-pr]
---
 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 1a4f163b1ac..4f1904cf873 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.10.3
+version=2.10.9
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=5d17b004aa989ac3e48f45b1579354cba08232e5d6e3648a09294f686769f162
+checksum=7c19213fe241aaa1e956371e938905d53eefa1b36c06d9df8dc1258a6d130e70
 
 post_install() {
 	vlicense LICENSE

From 51177f02b69130c1b7be0fc00d2cfef0bbdf9196 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 7 Jan 2021 16:41:31 +0100
Subject: [PATCH 269/752] elixir: update to 1.11.3.

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

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

From 0b9d34f6e161fdbbe2cea8400a275ebec089222d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 8 Jan 2021 17:00:14 +0100
Subject: [PATCH 270/752] lowdown: update to 0.7.7.

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

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

From 9b60d8adbde85dfecaa3f35dd097086834d26c6b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 5 Jan 2021 19:12:23 +1100
Subject: [PATCH 271/752] texlive: fix tlmgr.

Uses Debian's patch to force usermode and disable the use of tlpdb.

Also make the tlmgr wrapper use exec
---
 srcpkgs/texlive/files/tlmgr         |   2 +-
 srcpkgs/texlive/patches/tlmgr.patch | 113 ++++++++++++++++++++++++++++
 srcpkgs/texlive/template            |   2 +-
 3 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/texlive/patches/tlmgr.patch

diff --git a/srcpkgs/texlive/files/tlmgr b/srcpkgs/texlive/files/tlmgr
index 95bbe227492..ab49facd2d8 100755
--- a/srcpkgs/texlive/files/tlmgr
+++ b/srcpkgs/texlive/files/tlmgr
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/share/texmf-dist/scripts/texlive/tlmgr.pl "$@"
+exec /usr/share/texmf-dist/scripts/texlive/tlmgr.pl "$@"
diff --git a/srcpkgs/texlive/patches/tlmgr.patch b/srcpkgs/texlive/patches/tlmgr.patch
new file mode 100644
index 00000000000..0dc69247f41
--- /dev/null
+++ b/srcpkgs/texlive/patches/tlmgr.patch
@@ -0,0 +1,113 @@
+Modified from Debian's tlmgr patch.
+Src: https://raw.githubusercontent.com/debian-tex/texlive-nonbin/9767c8ba4ea64d671eb98ddff550498cd2ac3d51/texlive-base/debian/patches/debian-tlmgr-usermode.
+
+Modifications:
+
+* Drop Debian specific wording.
+* Drop unnessecary manpage changes.
+* Change /usr/share path to what we use.
+
+Modified by fosslinux.
+
+--- texk/texlive/linked_scripts/texlive/tlmgr.pl
++++ texk/texlive/linked_scripts/texlive/tlmgr.pl
+@@ -21,7 +21,7 @@
+ $tlmgrversion = "$tlmgrrevision ($datrev)";
+ 
+ our $Master;
+-our $ismain;
++our $ismain = 1;
+ our $loadmediasrcerror;
+ our $packagelogfile;
+ our $packagelogged;
+@@ -41,50 +41,8 @@
+ 
+ BEGIN {
+   $^W = 1;
+-  $ismain = (__FILE__ eq $0);
+-  # WARNING
+-  # The only use anticipated for tlmgr.pl as library for the 2009 release
+-  # is the Windows w32client prototype script.
+-  # Unix-specific problems with use as library will probably go undetected.
+-
+-  # make subprograms (including kpsewhich) have the right path:
+-  my $kpsewhichname;
+-  if ($^O =~ /^MSWin/i) {
+-    # on w32 $0 and __FILE__ point directly to tlmgr.pl; they can be relative
+-    $Master = __FILE__;
+-    $Master =~ s!\\!/!g;
+-    $Master =~ s![^/]*$!../../..!
+-      unless ($Master =~ s!/texmf-dist/scripts/texlive/tlmgr\.pl$!!i);
+-    $bindir = "$Master/bin/win32";
+-    $kpsewhichname = "kpsewhich.exe";
+-    # path already set by wrapper batchfile
+-  } else {
+-    $Master = __FILE__;
+-    $Master =~ s,/*[^/]*$,,;
+-    if ($ismain) {
+-      $bindir = $Master;
+-      $Master = "$Master/../..";
+-    } else {
+-      # for the time being, this code will not be used or tested
+-      $Master = "$Master/../../..";
+-      # no code yet for $bindir; would have to detect platform
+-    }
+-    # make subprograms (including kpsewhich) have the right path:
+-    $ENV{"PATH"} = "$bindir:$ENV{PATH}";
+-    $kpsewhichname = "kpsewhich";
+-  }
+-  if (-r "$bindir/$kpsewhichname") {
+-    # if not in bootstrapping mode => kpsewhich exists, so use it to get $Master
+-    chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
+-  }
+-
+-  # if we have no directory in which to find our modules,
+-  # no point in going on.
+-  if (! $Master) {
+-    die ("Could not determine directory of tlmgr executable, "
+-         . "maybe shared library woes?\nCheck for error messages above");
+-  }
+-
++  
++  $Master = "/usr/share/texmf-dist";
+   $::installerdir = $Master;  # for config.guess et al., see TLUtils.pm
+ 
+   # make Perl find our packages first:
+@@ -621,6 +579,13 @@
+     tldie("$prg: Try --help if you need it.\n");
+   }
+ 
++  # automatically switch to user mode on Void, and warn
++  if (!$opts{"usermode"} && $action ne "init-usertree") {
++    $opts{"usermode"} = 1;
++    print "WARNING: switching to user mode!\n";
++    print "WARNING: normal mode unsupported on Void Linux.\n";
++  }
++
+   #
+   # the main tree we will be working on
+   $::maintree = $Master;
+@@ -6099,7 +6064,9 @@
+ # sets up the user tree for tlmgr in user mode
+ sub action_init_usertree {
+   # init_local_db but do not die if localtlpdb is not found!
+-  init_local_db(2);
++  # we don't ship tlpdb in the system, so don't even
++  # try to initialize it.
++  # init_local_db(2);
+   my $tlpdb = TeXLive::TLPDB->new;
+   my $usertree;
+   if ($opts{"usertree"}) {
+@@ -6739,7 +6706,11 @@
+     if ($should_i_die == 2) {
+       return undef;
+     } else {
+-      die("cannot setup TLPDB in $::maintree");
++      if ($opts{'usermode'}) {
++        die("$prg: user mode not initialized, please run `tlmgr init-usertree`\n");
++      } else {
++        die("cannot setup TLPDB in $::maintree");
++      }
+     }
+   }
+   # setup the programs, for w32 we need the shipped wget/xz etc, so we
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 42d7bfcdf45..34f89b15972 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=5
+revision=6
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From b9c13846932fa94ea24d2ae84587de0926b7140d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 8 Jan 2021 15:33:12 +0100
Subject: [PATCH 272/752] linux-tools: don't need libucontext-devel explicitly
 anywhere

libunwind needs it, but pulls it in implicitly
---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 6ff237d5dd8..b83a10b1734 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -37,7 +37,7 @@ case "$XBPS_TARGET_MACHINE" in
 *)	subpackages+=" bpftool";;  # needs FTW_ACTIONRETVAL
 esac
 case "$XBPS_TARGET_MACHINE" in
-i686-musl) makedepends+=" libucontext-devel libunwind-devel" ;;
+i686-musl) makedepends+=" libunwind-devel" ;;
 esac
 
 nocross=yes

From a8d915f62d15bec25bb3f8b0bc6b74c21456e300 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 8 Jan 2021 18:57:39 +0100
Subject: [PATCH 273/752] kodi: disable gold

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

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 4c035767e4d..e40e41eb06e 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -5,7 +5,8 @@ revision=4
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
-configure_args="-DENABLE_INTERNAL_CROSSGUID=OFF -DWITH_FFMPEG=/usr"
+configure_args="-DENABLE_INTERNAL_CROSSGUID=OFF -DWITH_FFMPEG=/usr
+ -DENABLE_LDGOLD=OFF"
 short_desc="Software media player and entertainment hub for digital media"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -44,17 +45,12 @@ depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
-		hostmakedepends+=" libmysqlclient-devel SDL2_image-devel lzo-devel";
-		makedepends+=" python-devel ffmpeg-devel";
-		configure_args+=" -DENABLE_LDGOLD=Off -DENABLE_VAAPI=OFF";
+		hostmakedepends+=" libmysqlclient-devel SDL2_image-devel lzo-devel"
+		makedepends+=" python-devel ffmpeg-devel"
+		configure_args+=" -DENABLE_VAAPI=OFF"
 		;;
 esac
 
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 	find -type f | \

From fda817e16b9771d723540f5e2c76a5118f1c1d68 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Jan 2021 19:53:25 +0100
Subject: [PATCH 274/752] monero: update to 0.17.1.9.

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

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 5eece60647a..76537f0e249 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,6 +1,6 @@
 # Template file for 'monero'
 pkgname=monero
-version=0.17.1.8
+version=0.17.1.9
 revision=1
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
@@ -23,7 +23,7 @@ distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
  https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
-checksum="76a193833c8881b2e4f2f651ed411b77aa5d636a4e243e16c5f9f94f6efb24bf
+checksum="efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"

From 12a9e986ed7045ada73e85ad82bd34dabe58dfc5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Jan 2021 20:34:47 +0100
Subject: [PATCH 275/752] monero-gui: update to 0.17.1.9.

---
 srcpkgs/monero-gui/template | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 9cbdd9f1aff..6689e0dee3b 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,12 +1,13 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
-version=0.17.1.8
+version=0.17.1.9
 revision=1
-_monero_version=0.17.1.8
+_monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
 _supercop_gitrev="633500ad8c8759995049ccd022107d1fa8a1bbc9"
+_quirc_gitrev="7e7ab596e4d0988faf1c12ae89c354b114181c40"
 build_style=cmake
 configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
@@ -23,13 +24,16 @@ distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.
  https://github.com/monero-project/monero/archive/v${_monero_version}.tar.gz>monero-${_monero_version}.tar.gz
  https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
- https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
-checksum="b7e18ddaf19b49f2095076cbdb1b5b880f9a17bb1252a30c17406c8ad5dbfec8
- 76a193833c8881b2e4f2f651ed411b77aa5d636a4e243e16c5f9f94f6efb24bf
+ https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz
+ https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
+checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
+ efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
- b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"
-skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz"
+ b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7
+ c8366aecb6ba48ec50a7e579a4fa18eb55c3c4be7d3efb2a83726157977f4ca6"
+skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
+ ${_quirc_gitrev}.tar.gz"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -59,6 +63,7 @@ post_extract() {
 	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
 	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_supercop_gitrev}.tar.gz --strip-components 1 -C monero/external/supercop
 	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_randomx_version}.tar.gz --strip-components 1 -C monero/external/randomx
+	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quirc_gitrev}.tar.gz --strip-components 1 -C external/quirc
 }
 
 post_patch() {

From 12e89095b25ac6953f94bac7e05364439df03847 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Jan 2021 20:38:09 +0100
Subject: [PATCH 276/752] libkdcraw5: update to 20.12.1.

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

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 4b2e3bba205..78022b189d5 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=20.12.0
+version=20.12.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=99926c46cbf77aa28da63b0a625980d47beb5291ce00f6a187d77e37e9752e5a
+checksum=031640f7abf80b306cbe697a7abbea4b69abeeb5aee12d8712c274e519f372ee
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 66254398f91545452671ad93ece6678c8407cf59 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Jan 2021 20:50:06 +0100
Subject: [PATCH 277/752] gwenview: update to 20.12.1.

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

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e4554d1471c..ce10e92a669 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=343b0e0fa00631f837a3b11c973197d372b0588b0450fe0b8067b56a21ab39e1
+checksum=61696a9e1eb3c128724cec07dafb70cf609482984c95d3741724a31543be5176
 patch_args="-Np1"
 
 pre_configure() {

From c2816b6ff6879ed48dbc96dc26f36eed028b0eb6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Jan 2021 21:03:42 +0100
Subject: [PATCH 278/752] filezilla: update to 3.52.0.4.

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

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index ede40ba6098..013075cd57a 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.52.0.3
+version=3.52.0.4
 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=6dffaca15aa7fd80ec886198e1745088e1893c97639169f7e1c4c254d48a5d9a
+checksum=d5de791616042e31c25a7d9301252b76b22f18c1bc5ad44fc1ab5b0a633db4c0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From 8c65e29fb7c7f0d8cebaac16cf413b26c1730a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 8 Jan 2021 21:28:29 +0100
Subject: [PATCH 279/752] xnec2c: depend on libglvnd

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

diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 7048ada5709..df74e185d58 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,11 +1,11 @@
 # Template file for 'xnec2c'
 pkgname=xnec2c
 version=4.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
 makedepends="gtk+3-devel"
-depends="libGL"
+depends="libglvnd"
 short_desc="GTK2 application for Numerical Electromagnetics Code generation"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From 55a315c8b47ab8fd4a77659bf76b5f6b57c5516e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 8 Jan 2021 22:31:54 +0100
Subject: [PATCH 280/752] jsonnet: fix build

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

diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template
index c168680bdb6..b09df3187a0 100644
--- a/srcpkgs/jsonnet/template
+++ b/srcpkgs/jsonnet/template
@@ -10,7 +10,7 @@ homepage="https://github.com/google/jsonnet"
 distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz"
 checksum=076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe
 
-CXXFLAGS="-fPIC"
+CXXFLAGS="-fPIC -Iinclude -Ithird_party/json -Ithird_party/md5"
 
 jsonnet-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"

From c1e19b6dd28bac63de511a47be94ede23895002b Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 8 Jan 2021 14:38:25 -0700
Subject: [PATCH 281/752] youtube-dl: update to 2021.01.08

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

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

From c6f6a5af797bc4a6e7cad59b07926b0ce0100741 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 8 Jan 2021 22:55:32 +0100
Subject: [PATCH 282/752] starship: update to 0.48.0.

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

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 06b6406295d..0eae193aece 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,18 +1,18 @@
 # Template file for 'starship'
 pkgname=starship
-version=0.46.2
+version=0.48.0
 revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
-checkdepends="git"
+checkdepends="git fish-shell"
 short_desc="Minimal, fast and customizable cross-shell prompt"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="ISC"
 homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
-checksum=39301c8118239eda7b6d8dbcae498f28bfd901932e69003c249d99ee7989c1bb
+checksum=23e729ace48ec0bf6d8eff5f99003351463841f3b28fe453faceb62e6f99bae6
 
 post_build() {
 	STARSHIP="target/${RUST_TARGET}/release/starship"
@@ -21,9 +21,12 @@ post_build() {
 	vtargetrun ${STARSHIP} completions fish >starship.fish
 }
 
-pre_check() {
-	[ -L target/debug ] && unlink target/debug
-	ln -s release target/debug
+do_check() {
+	mkdir -p fake-home
+	local OLDHOME=$HOME
+	export HOME=$(pwd)/fake-home
+	cargo test -q --release --target ${RUST_TARGET}
+	export HOME=$OLDHOME
 }
 
 post_install() {

From ca55bdaeb8aecf6ad46d9895bf2928a9022a4732 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 8 Jan 2021 09:10:54 -0600
Subject: [PATCH 283/752] nvidia: update to 460.32.03.

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index fb7507d842e..6e2f3231022 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=450.80.02
+version=460.32.03
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=0f5a2f19f822d46c54500f4a6192dad9948821ed14ce7c13b38264d67aaf95b3
+checksum=4f2122fc23655439f214717c4c35ab9b4f5ab8537cddfdf059a5682f1b726061
 # 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}
@@ -129,8 +129,8 @@ do_install() {
 	ln -sf libglxserver_nvidia.so.${version} \
 		${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1
 
-	vinstall libnvidia-egl-wayland.so.1.1.4 755 usr/lib
-	ln -sf libnvidia-egl-wayland.so.1.1.4 \
+	vinstall libnvidia-egl-wayland.so.1.1.5 755 usr/lib
+	ln -sf libnvidia-egl-wayland.so.1.1.5 \
 		${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1
 
 	vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d

From 6ce816cd6bbec0ffae94bf93c9486aa4d9e56a26 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:30:22 -0300
Subject: [PATCH 284/752] thunderbird: update to 78.6.0.

- sync patches with firefox-esr
- add --allow-addon-sideload to mozconfig so language packs work
---
 srcpkgs/thunderbird/files/mozconfig           |  12 +-
 .../patches/big-endian-image-decoders.patch   |  88 +++++++++++
 .../disable-image-format-warning.patch        |  15 --
 srcpkgs/thunderbird/patches/fix-cross.patch   |  16 ++
 .../patches/fix-desktop-icon-path.patch       |  11 ++
 .../patches/fix-i686-ppc-musl.patch           |   8 +-
 .../patches/fix-image-format-warning.patch    |  39 +++++
 srcpkgs/thunderbird/patches/fix-musl.patch    |  11 --
 .../patches/fix-sandbox-membarrier.patch      |  52 -------
 .../thunderbird/patches/fix-seccomp-bpf.patch |  14 --
 srcpkgs/thunderbird/patches/fix-toolkit.patch |  78 ----------
 srcpkgs/thunderbird/patches/fix-tools.patch   |  29 ----
 .../thunderbird/patches/flac-no-ffvpx.patch   |  26 ++++
 .../thunderbird/patches/ppc32-fix-build.patch |  36 +++++
 .../patches/ppc32-skia-portable.patch         |  14 --
 .../thunderbird/patches/rust-configure.patch  |  15 +-
 .../thunderbird/patches/rust-has-i128.patch   |  21 +++
 .../thunderbird/patches/sandbox-fork.patch    |  13 ++
 .../patches/sandbox-largefile.patch           |  17 ++
 srcpkgs/thunderbird/patches/skia-sucks1.patch | 147 +++++++++---------
 srcpkgs/thunderbird/patches/skia-sucks3.patch |  28 +++-
 srcpkgs/thunderbird/patches/sndio.patch       |  81 +++-------
 srcpkgs/thunderbird/template                  |  64 ++++----
 23 files changed, 432 insertions(+), 403 deletions(-)
 create mode 100644 srcpkgs/thunderbird/patches/big-endian-image-decoders.patch
 delete mode 100644 srcpkgs/thunderbird/patches/disable-image-format-warning.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-cross.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-image-format-warning.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-musl.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-toolkit.patch
 create mode 100644 srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
 create mode 100644 srcpkgs/thunderbird/patches/ppc32-fix-build.patch
 delete mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-has-i128.patch
 create mode 100644 srcpkgs/thunderbird/patches/sandbox-fork.patch
 create mode 100644 srcpkgs/thunderbird/patches/sandbox-largefile.patch

diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 334846e9a64..b30e8fc4886 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -3,7 +3,6 @@ ac_add_options --libdir=/usr/lib
 
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libevent
@@ -12,12 +11,8 @@ ac_add_options --with-system-icu
 # XXX: the system's libpng doesn't have APNG support
 ac_add_options --without-system-png
 ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
-ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr
-ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr
-
 nspr_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
@@ -26,16 +21,17 @@ nss_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
 
-ac_add_options --disable-gconf
 ac_add_options --disable-tests
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
-ac_add_options --disable-gold
+ac_add_options --enable-release
 ac_add_options --enable-optimize="$CFLAGS"
 
 ac_add_options --enable-official-branding
-ac_add_options --enable-calendar
 ac_add_options --enable-application=comm/mail
+ac_add_options --enable-calendar
+
+ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/thunderbird/patches/big-endian-image-decoders.patch b/srcpkgs/thunderbird/patches/big-endian-image-decoders.patch
new file mode 100644
index 00000000000..ccb417b61f1
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/big-endian-image-decoders.patch
@@ -0,0 +1,88 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1626236
+https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
+
+# HG changeset patch
+# User msirringhaus@suse.de
+# Date 1582805876 -3600
+#      Thu Feb 27 13:17:56 2020 +0100
+# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
+# Parent  9cd90914846f667f18babc491a74c164ae5d6e9f
+imported patch decoder_workaround.patch
+
+diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
+--- image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -422,6 +422,9 @@
+   MOZ_ASSERT(mSwizzleFn);
+   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
+   mSwizzleFn(data, data, aColors);
++#if MOZ_BIG_ENDIAN()
++  SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
++#endif
+ }
+ 
+ LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
+diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
+--- image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -263,6 +263,9 @@
+         case JCS_YCbCr:
+           // By default, we will output directly to BGRA. If we need to apply
+           // special color transforms, this may change.
++#if MOZ_BIG_ENDIAN()
++          mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
++#else
+           switch (SurfaceFormat::OS_RGBX) {
+             case SurfaceFormat::B8G8R8X8:
+               mInfo.out_color_space = JCS_EXT_BGRX;
+@@ -277,6 +280,7 @@
+               mState = JPEG_ERROR;
+               return Transition::TerminateFailure();
+           }
++#endif
+           break;
+         case JCS_CMYK:
+         case JCS_YCCK:
+diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
+--- image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -361,7 +361,7 @@
+                                    IResumable* aOnResume) {
+   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
+ 
+-  return mLexer.Lex(aIterator, aOnResume,
++  LexerResult res = mLexer.Lex(aIterator, aOnResume,
+                     [=](State aState, const char* aData, size_t aLength) {
+                       switch (aState) {
+                         case State::PNG_DATA:
+@@ -371,6 +371,14 @@
+                       }
+                       MOZ_CRASH("Unknown State");
+                     });
++
++#if MOZ_BIG_ENDIAN()
++  if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
++      NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
++  }
++#endif
++
++  return res;
+ }
+ 
+ LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
+diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
+--- image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
++++ image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+@@ -237,7 +237,12 @@
+   // WebP doesn't guarantee that the alpha generated matches the hint in the
+   // header, so we always need to claim the input is BGRA. If the output is
+   // BGRX, swizzling will mask off the alpha channel.
++#if MOZ_BIG_ENDIAN()
++  mBuffer.colorspace = MODE_ARGB;
++  SurfaceFormat inFormat = mFormat;
++#else
+   SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
++#endif
+ 
+   SurfacePipeFlags pipeFlags = SurfacePipeFlags();
+   if (mFormat == SurfaceFormat::OS_RGBA &&
diff --git a/srcpkgs/thunderbird/patches/disable-image-format-warning.patch b/srcpkgs/thunderbird/patches/disable-image-format-warning.patch
deleted file mode 100644
index bd56e6bc37c..00000000000
--- a/srcpkgs/thunderbird/patches/disable-image-format-warning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Imported from Adélie. Firefox is prone to this warning on BE and
-it leads to huge .xsession-errors, and the warning is not very
-important or meaningful, so just disable it.
-
---- gfx/2d/HelpersCairo.h
-+++ gfx/2d/HelpersCairo.h
-@@ -147,7 +147,7 @@
-     case SurfaceFormat::R5G6B5_UINT16:
-       return CAIRO_FORMAT_RGB16_565;
-     default:
--      gfxCriticalError() << "Unknown image format " << (int)format;
-+      //gfxCriticalError() << "Unknown image format " << (int)format;
-       return CAIRO_FORMAT_ARGB32;
-   }
- }
diff --git a/srcpkgs/thunderbird/patches/fix-cross.patch b/srcpkgs/thunderbird/patches/fix-cross.patch
new file mode 100644
index 00000000000..9b8a816d269
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-cross.patch
@@ -0,0 +1,16 @@
+terrible hack to fix cross builds
+overwrite HOST_* flags to get rid of -MF
+
+note: this patch was used from firefox-77 until 80, dropped with the update to 81
+
+--- third_party/rust/glslopt/build.rs
++++ third_party/rust/glslopt/build.rs
+@@ -28,6 +28,8 @@
+     env::remove_var(format!("CXXFLAGS_{}", &target));
+     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
+     env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
++    env::set_var("HOST_CFLAGS", "-O2");
++    env::set_var("HOST_CXXFLAGS", "-O2");
+
+     configure(&mut cc::Build::new())
+         .warnings(false)
diff --git a/srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch b/srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch
new file mode 100644
index 00000000000..60af12e80b1
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch
@@ -0,0 +1,11 @@
+--- taskcluster/docker/firefox-snap/firefox.desktop.orig	2019-01-18 19:31:39.428839442 +0100
++++ taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
+@@ -154,7 +154,7 @@
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Icon=/browser/chrome/icons/default/default128.png
++Icon=firefox
+ 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
diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
index 40aab43ae86..6df609bbf16 100644
--- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
 --- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
 +++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -33,7 +33,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+@@ -41,7 +41,7 @@
+ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
  
--#if (defined(linux) &&                                            \
+-#if (defined(linux) && \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/thunderbird/patches/fix-image-format-warning.patch b/srcpkgs/thunderbird/patches/fix-image-format-warning.patch
new file mode 100644
index 00000000000..9b3b38d9065
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-image-format-warning.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Lee Salzman <lsalzman@mozilla.com>
+# Date 1462463631 14400
+#      Thu May 05 11:53:51 2016 -0400
+# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
+# Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
+handle big-endian formats in Cairo format conversions
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
++      // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
++      // See bug 1269654
++      if (format == SurfaceFormat::B8G8R8X8) {
++        return CAIRO_FORMAT_RGB24;
++      } else if (format != SurfaceFormat::B8G8R8A8) {
++        gfxCriticalError() << "Unknown image format " << (int)format;
++      }
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
+@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
+     case SurfaceFormat::A8:
+       return CAIRO_CONTENT_ALPHA;
+     default:
+-      gfxCriticalError() << "Unknown image content format " << (int)format;
++      if (format == SurfaceFormat::B8G8R8X8) {
++        return CAIRO_CONTENT_COLOR;
++      } else if (format != SurfaceFormat::B8G8R8A8) {
++        gfxCriticalError() << "Unknown image content format " << (int)format;
++      }
+       return CAIRO_CONTENT_COLOR_ALPHA;
+   }
+ }
diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/thunderbird/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
deleted file mode 100644
index caffd83cf67..00000000000
--- a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-allow usage of SYS_membarrier, needed since musl-1.1.22
-
---- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
-@@ -283,6 +283,8 @@
-       case __NR_set_tid_address:
-         return Allow();
- #endif
-+      case __NR_membarrier:
-+        return Allow();
- 
-         // prctl
-       case __NR_prctl: {
-
---- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
---- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1490,5 +1490,9 @@
- #define __NR_shutdown 373
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
deleted file mode 100644
index ed94fc39ed0..00000000000
--- a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig	2015-09-23 09:10:08.812740571 +0200
-+++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-09-23 09:11:38.404746155 +0200
-@@ -23,6 +23,11 @@
- #include "sandbox/linux/services/android_ucontext.h"
- #endif
- 
-+// musl libc defines siginfo_t __si_fields instead of _sifields
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#define _sifields __si_fields
-+#endif
-+
- namespace {
- 
- struct arch_sigsys {
diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
deleted file mode 100644
index 86e8ef47855..00000000000
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig    2016-07-05 21:00:03.672000517 +0200
-+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
-@@ -1134,6 +1134,12 @@
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
- #endif
-+
-+#undef __NR_pread
-+#define __NR_pread __NR_pread64
-+#undef __NR_pwrite
-+#define __NR_pwrite __NR_pwrite64
-+
- /* End of x86-64 definitions                                                 */
- #elif defined(__mips__)
- #if _MIPS_SIM == _MIPS_SIM_ABI32
---- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -45,6 +45,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <libgen.h>
- 
- #include <iostream>
- #include <set>
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-04-17 10:24:33.793431933 +0000
-@@ -41,6 +41,10 @@
- 
- #include "common/using_std_string.h"
- 
-+#ifndef N_UNDF
-+#define N_UNDF 0
-+#endif
-+
- using std::vector;
- 
- namespace google_breakpad {
---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-03-15 05:19:36.000000000 +0000
-+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-04-17 10:24:33.793431933 +0000
-@@ -55,7 +55,7 @@
-
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
--#elif defined(HAVE_A_OUT_H)
-+#elif 0
- #include <a.out.h>
- #endif
-
---- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
-+++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
-@@ -102,7 +102,7 @@
-
- #  ifdef SOLARIS
- #    include <sys/stat.h>
--#  else
-+#  elif !(defined(__linux__)) || defined(__GLIBC__)
- #    include <fts.h>
- #  endif
- #  include <dirent.h>
---- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
-+++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3978,6 +3978,7 @@
- 
- int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
-   int rv = OK;
-+#if !defined(__linux__) || defined(__GLIBC__)
-   FTS* ftsdir;
-   FTSENT* ftsdirEntry;
-   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
-@@ -4085,6 +4086,7 @@
-   }
- 
-   fts_close(ftsdir);
-+#endif
- 
-   return rv;
- }
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index 0ed043fb5b5..1af39bc6118 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -1,34 +1,5 @@
---- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
-+++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
-@@ -469,10 +469,10 @@
- // Return the non-directory portion of FILENAME: the portion after the
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string& filename) {
--  // Lots of copies!  basename's behavior is less than ideal.
--  char* c_filename = strdup(filename.c_str());
--  string base = basename(c_filename);
--  free(c_filename);
-+  // basename's behavior is less than ideal so avoid it
-+  const char *c_filename = filename.c_str();
-+  const char *p = strrchr(c_filename, '/');
-+  string base = p ? p+1 : c_filename;
-   return base;
- }
- 
 --- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
 +++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
-@@ -253,7 +253,11 @@
- 
-   // Request profiling signals.
-   struct sigaction sa;
-+#if defined(GP_ARCH_arm)
-+  sa.sa_sigaction = SigprofHandler;
-+#else
-   sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);
-+#endif
-   sigemptyset(&sa.sa_mask);
-   sa.sa_flags = SA_RESTART | SA_SIGINFO;
-   if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
 @@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
diff --git a/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch b/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
new file mode 100644
index 00000000000..e3f60e8ecf6
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch
@@ -0,0 +1,26 @@
+Enable FLAC on platforms without ffvpx like powerpc*
+
+diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
+index 53fc3c9937f7..b23771ab80fa 100644
+--- dom/media/flac/FlacDecoder.cpp
++++ dom/media/flac/FlacDecoder.cpp
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "mozilla/StaticPrefs_media.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -14,6 +15,11 @@ namespace mozilla {
+ bool FlacDecoder::IsEnabled() {
+ #ifdef MOZ_FFVPX
+   return StaticPrefs::media_flac_enabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return StaticPrefs::media_flac_enabled() &&
++         platform->SupportsMimeType("audio/flac"_ns,
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
+ #else
+   // Until bug 1295886 is fixed.
+   return false;
diff --git a/srcpkgs/thunderbird/patches/ppc32-fix-build.patch b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
new file mode 100644
index 00000000000..c1a8f422d0a
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch
@@ -0,0 +1,36 @@
+This is not a complete/correct patch, but it makes firefox build. For now
+mostly for tracking, so a real fix can be made, but right now it still
+segfaults on start.
+
+Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae
+Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
+Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
+Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
+
+--- xpcom/reflect/xptcall/xptcall.h
++++ xpcom/reflect/xptcall/xptcall.h
+@@ -71,6 +71,11 @@ struct nsXPTCVariant {
+     ExtendedVal ext;
+   };
+ 
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  // this field is still necessary on ppc32, as an address
++  // to it is taken certain places in xptcall
++  void *ptr;
++#endif
+   nsXPTType type;
+   uint8_t flags;
+ 
+@@ -91,7 +96,12 @@ struct nsXPTCVariant {
+   };
+ 
+   void ClearFlags() { flags = 0; }
++#if defined(__powerpc__) && !defined(__powerpc64__)
++  void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; }
++  bool IsPtrData() const { return IsIndirect(); }
++#else
+   void SetIndirect() { flags |= IS_INDIRECT; }
++#endif
+ 
+   bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); }
+ 
diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
deleted file mode 100644
index 93c625a861e..00000000000
--- a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -1806,6 +1806,11 @@ typedef enum {
-     Op_store_ffff,
- } Op;
- 
-+// work around ICE on 32-bit ppc
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+#  define SKCMS_PORTABLE
-+#endif
-+
- #if defined(__clang__)
-     template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
- #elif defined(__GNUC__)
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
index 09191782b35..887c102bc55 100644
--- a/srcpkgs/thunderbird/patches/rust-configure.patch
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -1,20 +1,23 @@
---- build/moz.configure/rust.configure	2020-06-06 10:05:25.819337924 +0200
-+++ build/moz.configure/rust.configure	2020-06-06 10:07:11.346031015 +0200
-@@ -79,10 +79,6 @@
+Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
+
+--- build/moz.configure/rust.configure.orig	2019-10-17 04:19:59.000000000 +0700
++++ build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
+@@ -78,9 +78,6 @@
  
      return unwrap
  
 -rustc = unwrap_rustup(rustc, 'rustc')
 -cargo = unwrap_rustup(cargo, 'cargo')
 -
--
+ 
  set_config('CARGO', cargo)
  set_config('RUSTC', rustc)
+@@ -348,26 +345,6 @@
  
-@@ -366,25 +362,6 @@
              os.write(in_fd, source)
              os.close(in_fd)
- 
+-
 -            cmd = [
 -                rustc,
 -                '--crate-type', 'staticlib',
diff --git a/srcpkgs/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch
new file mode 100644
index 00000000000..4c90cd3d106
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-has-i128.patch
@@ -0,0 +1,21 @@
+The configure check fails for cross builds.
+i128 is supported since rust-1.26, so it is safe for us to assume it is always present
+
+--- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
++++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
+@@ -1,14 +1,5 @@
+-extern crate autocfg;
+-
+-use std::env;
+-
+ fn main() {
+-    let ac = autocfg::new();
+-    if ac.probe_type("i128") {
+-        println!("cargo:rustc-cfg=has_i128");
+-    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
+-        panic!("i128 support was not detected!");
+-    }
++    println!("cargo:rustc-cfg=has_i128");
+ 
+     autocfg::rerun_path("build.rs");
+ }
diff --git a/srcpkgs/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch
new file mode 100644
index 00000000000..72640cb7f70
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/sandbox-fork.patch
@@ -0,0 +1,13 @@
+make SYS_fork non-fatal, musl uses it for fork(2)
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -1253,6 +1253,8 @@
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
++      case __NR_fork:
++        return Error(ENOSYS);
+ 
+ #  ifdef __NR_fadvise64
+       case __NR_fadvise64:
diff --git a/srcpkgs/thunderbird/patches/sandbox-largefile.patch b/srcpkgs/thunderbird/patches/sandbox-largefile.patch
new file mode 100644
index 00000000000..494ca82df5a
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/sandbox-largefile.patch
@@ -0,0 +1,17 @@
+--- security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:41:14.556378950 +0100
++++ security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:40:23.595806444 +0100
+@@ -68,7 +68,13 @@
+ 
+ // The headers define O_LARGEFILE as 0 on x86_64, but we need the
+ // actual value because it shows up in file flags.
+-#define O_LARGEFILE_REAL 00100000
++#if defined(__x86_64__) || defined(__i386__) || defined(__mips__)
++#define O_LARGEFILE_REAL 0100000
++#elif defined(__powerpc__)
++#define O_LARGEFILE_REAL 0200000
++#else
++#define O_LARGEFILE_REAL O_LARGEFILE
++#endif
+ 
+ // Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751.
+ #define FMODE_NONOTIFY 0x4000000
diff --git a/srcpkgs/thunderbird/patches/skia-sucks1.patch b/srcpkgs/thunderbird/patches/skia-sucks1.patch
index 223c9b14e6b..05ad34a3fc3 100644
--- a/srcpkgs/thunderbird/patches/skia-sucks1.patch
+++ b/srcpkgs/thunderbird/patches/skia-sucks1.patch
@@ -1,84 +1,77 @@
-# HG changeset patch
-# Parent  548d0a2f3a22bfac32ec0c3921c6c969c8bf32a9
+https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
+https://bugzilla.mozilla.org/attachment.cgi?id=9028600
 
-diff -r 548d0a2f3a22 gfx/2d/ConvolutionFilter.cpp
---- gfx/2d/ConvolutionFilter.cpp	Mon Jul 22 16:57:54 2019 +0200
-+++ gfx/2d/ConvolutionFilter.cpp	Thu Jul 25 14:27:59 2019 +0200
-@@ -35,9 +35,38 @@
-   return true;
+--- gfx/skia/skia/third_party/skcms/skcms.cc
++++ gfx/skia/skia/third_party/skcms/skcms.cc
+@@ -30,6 +30,8 @@
+         #include <avx512fintrin.h>
+         #include <avx512dqintrin.h>
+     #endif
++#elif defined(__BIG_ENDIAN__)
++    #define SKCMS_PORTABLE
+ #endif
+ 
+ // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
+@@ -280,20 +282,28 @@ enum {
+ static uint16_t read_big_u16(const uint8_t* ptr) {
+     uint16_t be;
+     memcpy(&be, ptr, sizeof(be));
+-#if defined(_MSC_VER)
+-    return _byteswap_ushort(be);
++#if defined(__BIG_ENDIAN__)
++    return be;
+ #else
++    #if defined(_MSC_VER)
++    return _byteswap_ushort(be);
++    #else
+     return __builtin_bswap16(be);
++    #endif
+ #endif
  }
  
-+static void ByteSwapArray(uint8_t *u8Array, int32_t size) {
-+    uint32_t *array = reinterpret_cast<uint32_t*>(u8Array);
-+    for (int pxl = 0; pxl < size; ++pxl) {
-+        // Use an endian swap to move the bytes, i.e. BGRA -> ARGB.
-+        uint32_t rgba = array[pxl];
-+        array[pxl] = NativeEndian::swapToLittleEndian(rgba);
-+    }
-+}
-+
- void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst,
-                                              bool aHasAlpha) {
-+#ifdef MOZ_BIG_ENDIAN
-+    int outputSize = mFilter->numValues();
-+
-+    // Input size isn't handed in, so we have to calculate it quickly
-+    int inputSize = 0;
-+    for (int xx = 0; xx < outputSize; ++xx) {
-+        // Get the filter that determines the current output pixel.
-+        int filterOffset, filterLength;
-+        mFilter->FilterForValue(xx, &filterOffset, &filterLength);
-+        inputSize = std::max(inputSize, filterOffset + filterLength);
-+    }
-+
-+    ByteSwapArray((uint8_t*)aSrc, inputSize);
-+#endif
-+
-   SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha);
-+
-+#ifdef MOZ_BIG_ENDIAN
-+    ByteSwapArray((uint8_t*)aSrc, inputSize);
-+    ByteSwapArray(aDst, outputSize);
-+#endif
+ static uint32_t read_big_u32(const uint8_t* ptr) {
+     uint32_t be;
+     memcpy(&be, ptr, sizeof(be));
+-#if defined(_MSC_VER)
+-    return _byteswap_ulong(be);
++#if defined(__BIG_ENDIAN__)
++    return be;
+ #else
++    #if defined(_MSC_VER)
++    return _byteswap_ulong(be);
++    #else
+     return __builtin_bswap32(be);
++    #endif
+ #endif
  }
  
- void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst,
-@@ -49,8 +78,26 @@
-   int32_t filterLength;
-   auto filterValues =
-       mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength);
-+
-+#ifdef MOZ_BIG_ENDIAN
-+  for (int filterY = 0; filterY < filterLength; filterY++) {
-+      // Skia only knows LE, so we have to swizzle the input
-+    ByteSwapArray(aSrc[filterY], aRowSize);
-+  }
-+#endif
-+
-   SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst,
-                               aHasAlpha);
-+
-+#ifdef MOZ_BIG_ENDIAN
-+  // After skia is finished, we swizzle back to BE, in case
-+  // the input is used again somewhere else
-+  for (int filterY = 0; filterY < filterLength; filterY++) {
-+    ByteSwapArray(aSrc[filterY], aRowSize);
-+  }
-+  // The destination array as well
-+  ByteSwapArray(aDst, aRowSize);
-+#endif
+--- gfx/2d/DrawTargetSkia.cpp
++++ gfx/2d/DrawTargetSkia.cpp
+@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
+   return surfaceBounds.Intersect(bounds);
  }
  
- /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's
-diff -r 548d0a2f3a22 gfx/skia/skia/include/core/SkPreConfig.h
---- gfx/skia/skia/include/core/SkPreConfig.h	Mon Jul 22 16:57:54 2019 +0200
-+++ gfx/skia/skia/include/core/SkPreConfig.h	Thu Jul 25 14:27:59 2019 +0200
-@@ -73,7 +73,7 @@
-       defined(__ppc__) || defined(__hppa) || \
-       defined(__PPC__) || defined(__PPC64__) || \
-       defined(_MIPSEB) || defined(__ARMEB__) || \
--      defined(__s390__) || \
-+      defined(__s390__) || defined(__s390x__) || \
-       (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
-       (defined(__ia64) && defined(__BIG_ENDIAN__))
-          #define SK_CPU_BENDIAN
+-static const int kARGBAlphaOffset =
+-    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
++static const int kARGBAlphaOffset = 0;
+ 
+ static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
+                              const int32_t aStride, SurfaceFormat aFormat) {
+--- gfx/2d/Types.h
++++ gfx/2d/Types.h
+@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
+ // The following values are endian-independent synonyms. The _UINT32 suffix
+ // indicates that the name reflects the layout when viewed as a uint32_t
+ // value.
+-#if MOZ_LITTLE_ENDIAN()
+   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
+   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
+-#elif MOZ_BIG_ENDIAN()
+-  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
+-  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
+-#else
+-#  error "bad endianness"
+-#endif
+ 
+   // The following values are OS and endian-independent synonyms.
+   //
diff --git a/srcpkgs/thunderbird/patches/skia-sucks3.patch b/srcpkgs/thunderbird/patches/skia-sucks3.patch
index d95b81698e9..f4e890f0536 100644
--- a/srcpkgs/thunderbird/patches/skia-sucks3.patch
+++ b/srcpkgs/thunderbird/patches/skia-sucks3.patch
@@ -1,3 +1,5 @@
+CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
+
 # HG changeset patch
 # Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
 Problem description: Tab-titles that are too long to fit into a tab get faded out.
@@ -17,7 +19,7 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
        SkCanvas::kPreserveLCDText_SaveLayerFlag |
            (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
  
-+#if MOZ_BIG_ENDIAN
++#if MOZ_BIG_ENDIAN()
 +  // Pushing a layer where an aMask is defined produces wrong output.
 +  // We _should_ endian swap the data, but I couldn't find a workable way to do so
 +  // Therefore I deactivate those layers in the meantime.
@@ -28,3 +30,27 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
    mCanvas->saveLayer(saveRec);
  
    SetPermitSubpixelAA(aOpaque);
+--- gfx/layers/composite/CompositableHost.cpp
++++ gfx/layers/composite/CompositableHost.cpp
+@@ -13,6 +13,7 @@
+ #include "ImageHost.h"  // for ImageHostBuffered, etc
+ #include "Layers.h"
+ #include "TiledContentHost.h"  // for TiledContentHost
++#include "mozilla/EndianUtils.h"
+ #include "mozilla/gfx/gfxVars.h"
+ #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
+ #include "mozilla/layers/TextureHost.h"     // for TextureHost, etc
+@@ -92,9 +93,13 @@ bool CompositableHost::AddMaskEffect(EffectChain& aEffects,
+   }
+   MOZ_ASSERT(source);
+ 
++  // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
++  // if the typed URL is too long for the textbox (automatic scrolling needed)
++#if MOZ_LITTLE_ENDIAN()
+   RefPtr<EffectMask> effect =
+       new EffectMask(source, source->GetSize(), aTransform);
+   aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
++#endif
+   return true;
+ }
+ 
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 6c72284c19b..c5e5c486dd1 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -1,8 +1,8 @@
 --- old-configure.in.orig
 +++ old-configure.in
-@@ -2839,6 +2839,22 @@
- 
- AC_SUBST(MOZ_ALSA)
+@@ -2818,6 +2818,22 @@
+     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
+ fi
  
 +dnl ==================================
 +dnl = Check sndio availability
@@ -21,26 +21,11 @@
 +AC_SUBST(MOZ_SNDIO)
 +
  dnl ========================================================
- dnl = Disable PulseAudio
- dnl ========================================================
---- toolkit/library/moz.build.orig
-+++ toolkit/library/moz.build
-@@ -235,10 +235,8 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-     OS_LIBS += CONFIG['TK_LIBS']
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
--    OS_LIBS += [
--        'sndio',
--    ]
-+if CONFIG['MOZ_SNDIO']:
-+    OS_LIBS += CONFIG['MOZ_SNDIO_LIBS']
- 
- if CONFIG['MOZ_ENABLE_DBUS']:
-     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
+ dnl =
+ dnl = Maintainer debug option (no --enable equivalent)
 --- media/libcubeb/src/moz.build.orig
 +++ media/libcubeb/src/moz.build
-@@ -43,7 +43,7 @@
+@@ -44,11 +44,13 @@
      ]
      DEFINES['USE_JACK'] = True
  
@@ -49,49 +34,19 @@
      SOURCES += [
          'cubeb_sndio.c',
      ]
---- build/moz.configure/old.configure.orig
-+++ build/moz.configure/old.configure
-@@ -169,6 +169,7 @@
+     DEFINES['USE_SNDIO'] = True
++
++if CONFIG['OS_ARCH'] == 'OpenBSD':
+     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
+ 
+ if CONFIG['OS_TARGET'] == 'Darwin':
+--- build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
++++ -	2020-06-30 12:18:26.027756310 +0200
+@@ -210,6 +210,7 @@
  @old_configure_options(
      '--cache-file',
      '--datadir',
 +    '--enable-sndio',
-     '--enable-content-sandbox',
-     '--enable-cookies',
-     '--enable-cpp-rtti',
---- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
-+++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-@@ -349,6 +349,21 @@
-         }
-       }
-     }
-+
-+#ifdef MOZ_SNDIO
-+    // ~/.aucat_cookie (sndio)
-+    rv = homeDir->Clone(getter_AddRefs(confDir));
-+    if (NS_SUCCEEDED(rv)) {
-+      rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie"));
-+      if (NS_SUCCEEDED(rv)) {
-+        nsAutoCString tmpPath;
-+        rv = confDir->GetNativePath(tmpPath);
-+        if (NS_SUCCEEDED(rv)) {
-+          policy->AddPath(rdwrcr, tmpPath.get());
-+        }
-+      }
-+    }
-+#endif
-   }
- 
-   // Firefox binary dir.
---- security/sandbox/linux/moz.build.orig
-+++ security/sandbox/linux/moz.build
-@@ -81,6 +81,9 @@
- if CONFIG['MOZ_ALSA']:
-     DEFINES['MOZ_ALSA'] = True
- 
-+if CONFIG['MOZ_SNDIO']:
-+    DEFINES['MOZ_SNDIO'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
+     '--enable-crashreporter',
+     '--enable-dbus',
+     '--enable-debug-js-modules',
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 72799736e9b..5ccbe65c264 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=68.12.1
+version=78.6.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,27 +11,26 @@ maintainer="Enno Boland <gottox@voidlinux.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=a2044fb611ac6ab1744ef61f5d292d2c81b8103438df02b6dd754968efc9a3af
+checksum=1dd6f9a4d88b4c3d0ec47bba60a891243ef95e105a9045b2d32e2b126779844b
 
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python python3 yasm rust cargo
- llvm clang nodejs cbindgen nasm which tar"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
+ llvm clang nodejs-lts-10 cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
- pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
+ pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
  libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
- $(vopt_if sndio sndio-devel)"
-depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
+ $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
+depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme"
 
-build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
-build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
+build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
+build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
-	armv6*) broken="required NEON extensions are not supported on armv6" ;;
+	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -64,7 +63,9 @@ post_extract() {
 }
 
 post_patch() {
-	_clear_vendor_checksums cssparser
+	_clear_vendor_checksums audio_thread_priority
+	_clear_vendor_checksums num-traits
+	_clear_vendor_checksums glslopt
 }
 
 do_build() {
@@ -73,6 +74,7 @@ do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
+		echo "ac_add_options --disable-gold" >>.mozconfig
 		echo "ac_add_options --enable-release" >>.mozconfig
 		;;
 	esac
@@ -93,18 +95,15 @@ do_build() {
 		export LDFLAGS+=" -latomic"
 	fi
 
-	case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl|i686-musl)
-		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
-		echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig
-		;;
-	esac
-
 	if [ "$CROSS_BUILD" ]; then
 		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
 			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
 			sed '1,1d;$d' | sed  's/^ /-I/' | paste -s )
 
+		# fix compiler detection for botan:
+		# https://github.com/randombit/botan/blob/63d51cb1ab08849d8ece329811b61f8c9abebbcf/configure.py#L2888
+		export CXX="${XBPS_CROSS_TRIPLET}-g++"
+
 		export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
 			--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
 		export HOST_CC=cc
@@ -128,10 +127,6 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
@@ -145,9 +140,16 @@ do_build() {
 		export LDFLAGS+=" -Wl,--no-keep-memory"
 		# patch the rust debug level, this is hardcoded
 		sed -i "s/debug_info = '2'/debug_info = '1'/" \
-		 build/moz.configure/toolchain.configure
+		build/moz.configure/toolchain.configure
 	fi
 
+	# FIXME: incompatible with rust 1.48 in this release
+	#case "$XBPS_TARGET_MACHINE" in
+	#aarch64*|i686*|x86_64*)
+	#	echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
+	#esac
+	echo "ac_add_options --disable-rust-simd" >>.mozconfig
+
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -157,20 +159,20 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	# avoid error: /usr/bin/as: invalid option -- 'N'
-	unset AS
+
+	export AS=$CC
 
 	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 ac_add_options $(vopt_enable alsa)
+ac_add_options $(vopt_enable jack)
 ac_add_options $(vopt_enable sndio)
 ac_add_options $(vopt_enable dbus)
 ac_add_options $(vopt_enable dbus necko-wifi)
 ac_add_options $(vopt_enable pulseaudio)
-ac_add_options $(vopt_enable startup_notification startup-notification)
-ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk')
+ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
 !
 
 	rm -f old-configure
@@ -182,9 +184,9 @@ do_install() {
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences
 	vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications
 
-	for i in 16 22 24 32 48 256; do
-		vinstall ./comm/mail/branding/thunderbird/default$i.png 644 \
-			usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png
+	for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do
+		vinstall ${wrksrc}/comm/mail/branding/thunderbird/default${i%x*}.png 644 \
+			usr/share/icons/hicolor/${i}/apps thunderbird.png
 	done
 
 	# Use system-provided dictionaries

From 7452c8959b19928bf829266e0619845817671daf Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:30:35 -0300
Subject: [PATCH 285/752] thunderbird-i18n: update to 78.6.0.

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

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 47c9ca4b560..79cd560228e 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=68.12.1
+version=78.6.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -79,7 +79,7 @@ for _lang in "${_languages[@]}"; do
 	_pkgname=thunderbird-i18n-${_locale}
 
 	depends+=" ${_pkgname}>=${version}"
-	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-i686/xpi/${_locale}.xpi"
+	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi"
 
 	eval "${_pkgname}_package() {
 		_pkgtmpl $_lang
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="daaef9e7b8c55328def0f22cad60ca48ad774afc4190b5e5eaf8e3dd1a4e5f28
- 8ff401dac77853307572acc410fd9c60b27b9577e7cbeff798e09107ed423d9c
- cd19b72064b00ad4ba4b4c851e8ec634b3c75e2102b38c44385c761ec9152a81
- 031c9f61077ab08e8b896668e61e09a01720ac5f22f1a97046e4ba1abff653c3
- 6e6b9f12dce243c15f0601f7a6743e8fb0c3a2d98475659ea778afa80382d826
- 574b0ffef6849443395533a638ad9931dc2226f619a13526ea16364f60865d79
- 62d43bab52e891d56b43696f80a4d7287c9e5b92e57645dcc0e2b800e49bfc73
- 546bcb01d473cdf3d114efc7546d7499997c49710e38a75c77875cc0141b8582
- 0a4a2238f2630b3d2aa244aafe2bc59b78192fe973e977b72e71bcd170b852d7
- 2e2e2d793f49c323d265205f75ab08c460591c400a28b9c11c71dd3080c4e111
- 4b54e6395e0cad7bf01a41aea26eaa0b8a238d83bbbef70a80cb5472408c3538
- 782c27adfcfa3d8bfbbb46eaf2442f738f63e623e5c3a9fe25e9ef06c54270f2
- dc23f05f6df9c9c133c5c1102e02d3703a7d42d6cd3021ff9e1b44bc010d36fa
- 189307a002a0ee88dfb373ae7daef44f13d3d86d292404fe75b9282c6ec70d9d
- ef8be85899e8690b56a82bfafcb2422e21aa688ca716cf88fad660e2413a4371
- def5c5acbc82f1274c74d407e4ce9aeca05298d4d2ecff9ee6a4048c4f748bb9
- de3289bc94be4a76777a56af95b04957fc8289ac0e28a0fe5b0f84716164f3b1
- b87fce391136a20fb53690cbdfe96511d0f44a07c8f6850d46942d753506dafe
- 2ea16aaf34e59b91d079b238489b8e99f2ac5c051127d80c130606fbedc17e82
- d67cbf27d266394ec2ffdd6f6d5925a1bc3b779e190b43e126fac869d32a9772
- 5f241e80aafee6bd7cb38708723d65d22d0cf599da8310afed43b571e654ad30
- 04b1aa4a9540672b27a318bf0e8b051ecd2fd8e0fac9688972a98d24dc395cdc
- ce24a1f51ff480d87b575e68d3da088ab70390a6efdc86a373bcc625b0d4fe69
- ea147f235edafa18144c76ca843716d5e4a3806f7096a2888c15e45a291b8bb2
- 061ba1d21aedcdcbcf8b8a9bab53b16ef34e4b4abda0d2e43e49d4263ffbffb7
- 819530775c72a822a581c76d090e0709133905293d3df769d2c85692d1c7a4d9
- c2f22993f2fd735e4ba8a34e8857546c4b9792b9a93488dddba30a2527ae174a
- a847a8f00321f20846c45907458ae76f842d3107ddfac2fcf71e641c6a080c51
- bcc6e48b51c67571c5ec08361134fbc3e4982ed27f3dab1e5b1ccfd26b3e22b1
- 368d63db282c200f5caaf65837a470df64db5a513d0b5e7d639e353fa8987c51
- 084bf0bb5fc42f068ae099d845c121f5ec8a1bcb91a76d80b6e49394b9e85e9d
- 578c24c143dda65697dc1708597215d59e5f2cc68b1f52e00901e07b3cea0dd4
- 1c2769d19ee3d444c75c4133f540ecf6860a6272bbb69f13524ca928bac33721
- a9f2683f18b29503ea38df815107e3753c0c3c37468cc0c23fea25080ba7392d
- dd61640c8987cbc5b8a41465e89200e3cef635c6931ce3f586a683d992492409
- c274dc81cab7b3b2ba3e0a4a55b4b94ed9ff02be48c808b0164aba386aae7cd9
- 76b850488e513e5181b4f460227fdb9f7a297aa95bca7778f407521be6355d23
- 1924933c175b04d088fc5764fedc6a317396234e591ef9f787cbd6d21bf43790
- 28006df283c06e44ef08901f9db21011350930bdf0d0cba132d2d8eadbefd314
- a90bce2d48d0b2f2db0423a22aad05c129029fb1b38824d7bb7875e6ff7a1cf4
- 77fbb6ddc67edffbdb0d3f992ed54f5309da13dfa9216d5c4ee613be6c9cec37
- 19df7a1f9216a69098fdbe7629140e7f36f52dbdd4b15a4c78734e448be3cdb2
- 0768ddd6ffeec0b1354270ff8c9627bffe9ddbe907c9d35081d5d9b6bae04874
- 8de1bb65249f9b06a3f90c02c1c715c8e308bccbaae22cde2f784ccac9228573
- eebe0e05bab4a0061d5d8eb1cbb5f2769ca4befd3276db769b83906adaa3ef34
- c23110b70da779084bbac3d55e87482ebf9502f249e11d9ed8956aac767f5889
- 27b5911a4ffa6a2a3e9ec4fdb10420ba33f333d9ac11deda8115656c5bcefb0b
- 44954a28be58dc2de08f0586ec7d8591939f81f3bb05a4574d8f58ac00b55ce8
- 3ac0f4e9cfcbe5089dcfb36eb39d8e26b16f062dcc12b5b89e6f619ab3caf013
- 4be6d239fd175d1bef88da579c7c1e6b244ae698aa4302a8a00069e2c0119331
- c705309c32c0d4af7b4f8e98095919f2942329b1cad75e8fff168f6c0ea71baf
- e6b9247a733e918f5e49aa6d11563c52b33d5f4f2f2cd4fd542953602b090c68
- ae1b27bba6d82606b55bffc0275e35bbf6da3b5d6c5e242ce5ac62d3bf81c630
- ffb9e14f03454cdf2d180d3960a3bbd13ccb6e177e86a1918d524c6de203df28
- cca092e8f86e4102de12461ab5c8ab0b601846113a837508ff8b8c9d5a10e588"
+checksum="77c0da17d85872a3ceae3d5849655a0dd3d783b365d405d4c2f9b3a243b3e5aa
+ e92122dfd91a99e7c32b90c5055f7f0c1a5268e0c001da5fc142a9d63261f0de
+ 62d1d6d4f34292549b6ada66ede177b1a26efaeaa2e4d9e0f5ea7aeb6a555c1a
+ 7846462412da03936930afb548657bea5c0e73eb464affd54459332888b6c744
+ 27534af1a57041a076261443347f183d80d757da14157ddba11ff393f248ed8b
+ c1541a2035e9ae4549c337686c9d8e9e995a32bc6173794d834bd83f404845dc
+ 3791e46378d40f75016ff5d35e66a8cef8aaed45f87368ac07bcec7fa916472f
+ 617f1c23b7210bf4ceccb22a3824a15074e2d9770ca66a26f6448d26beb72e81
+ e90862ea3b5a6653e9eea25613915392c438ae5ae42d860440d85ffa1d850e3d
+ 59bbfca02bb2ac6853c845653dc2de5ba123b33b468595a356f419c1fc8b6527
+ ec3e37a0a4c4dde29ba4c538d1efc1e135ef950ce95aa928c617b9da2a3de783
+ 27c42d0537c3e51c7b2289fd25ef201bcd62281b5d844b68c03474be2a1e54e6
+ b299d69c68a79e3709c1487ae87f8ebf5765ef38f483d148238c7c7bd54a047a
+ 408fe2cc100ea42751baa138b98d62ed78b5bb69f44039f61eea8262d5e9cd2e
+ 913446300c7b3e837309fb137e7f68f62da3c23939287feeb94a5d35425140ca
+ 5ed478e15a65d6ff15683b64f2769e3f7ced421c424d59ea7dba644cb5b84759
+ 2b7d9416fa15300c18b13a34ab709b307ded3705d0ccffc70423ecf9762dbff8
+ 31628ff53e3e87cbce122908b537df030f3ec936def0eb0e50c9791e6103b042
+ d7233c9efe07e54ec29911a8b27b8bce2b09f59e027687218c300374abc80aea
+ 6ed4dc7f605de1516f9ae175b2b12bcd9d0fce64a8f00acb9a675ac1258af6a9
+ 16a31b73042ffaf8373a977cdb2a2c563a6b49d13bc504569865a305e3fae380
+ 5328efe43bdf651f3ff72696f96e8ea2aa000a95233b6a406f612c6a076ac38c
+ 802db39bd53707555bbd5202c2668c7be92598b75cd7364e6169218c9f1f001e
+ 9f9a547d87133a468757baa38a600ad24a8479231766529c2612d6f7a63836a2
+ 82cf87688f7594e9d882969efd5a5963f3fa3f8b91e026b271fe630b3fda777a
+ 55c8f68d1702befe1782c7373893fac4d9e15fb77fcd9ee4d8345707969dcf97
+ 3cdcf203980d08dd18f0b6a566dc2585140625807f839102f15f0b685312aef6
+ 52ed8740582330ac3e2660f86b07676aa72533180d5a0df411569cda7e0d0ee2
+ 2e2eaf97e024d908b4cbd837bd8d14e50fc30bc877958f458568f3d5ef03debf
+ 44830607a1818da44721d6dfb7c60395c5557c4e84fcbf7936106f6d64c0b2df
+ 1727d70e0a3a8c8c8c6dc049243cd7ffb6710226b0ab7e4e4d776e241c13eaf9
+ 10cb0bdbc88f5718f7a7877d4ec2c5e7fc71e4dd13e0522ec10082f9846fb65c
+ 77740587416416ca7401573e4ba820ad2a3adb32374cb83b8a56e48aa4411b28
+ 7b63447a8ee28e635e7cb060a1df868c6a8c0d11448c30712fae971ba02e132e
+ a4aa893d47d6edb2e9f8ad6423abe17e39be8dded5f359ed933723b944c6a85b
+ 327cdc48a35fdcae7daa3dac86005d15798fd8ad4ffd47a497923dcbdf9cf386
+ 32a0a2dc3075db4645836dab1d6353d9466328c0e63e183290f345a04e285f87
+ e07cc90bcb41097ba19d886d2d1e38ef3b3ae2f6d36cf0133e018e40535357d6
+ 669a76ddd841a6559cbfdd97c82961251030e01036831279210f94606d472f05
+ e6f698313d67ab9da38ff1ff8097264dabc87de85df0e1c363736f60ad0954e2
+ 48ac6b9506b2cae19451845a6d633579ed341e367e4c22f525c5d147cea7bb85
+ 45fbeacc161c4d3e9fa8ba12c7a06b6ddf56dc5aa3c49543f45c9e5ecc6f8533
+ 8114465485f3740e2f38cd31e29e183a91cfe50c1b3bcdd2fac37f5254df38c5
+ 26869522aa4a17cd3965dc35442e6687cec86274cc17d43d3eda36b71e293071
+ 79ede7a6a4fdc587996a6717891a1931f63a07d468d3adf07b4df56402202fbd
+ 76acb24a68cc77a9f28b31e7337c815b8fefa81df6a47d57ed81612dc69c9878
+ bace543f253d44df294a35bb9db6dd4fbef8d0196a5698e0a862c589519c07d5
+ 8b6bd148954f415265dee893ca94024826c0f3a2ed0c308e3386637f158ed26b
+ 887a93e80fa6b42832e04ebea6f5c1a3cdb76cb6d4b2b0c0c882ab3c80a2c2da
+ 0e7b8d2f3c7b57751cc68aae7135976c9683eb14b703d23b90fe31ed4170b55c
+ 82f17754a013e65ad962e88a709be83eae9a00f0ba62c94bfbdf53eeb099ed19
+ 1aa191b1dd13e47e02e7167063afc89bb091d7a38708fc5d7e8e5c0a34f4dd43
+ cedb43a69a31e5c889f5dd485cc8036819248cfe8e49c4b519f4854c5dddb3a8
+ 131e883c87b8f4af323007f112ae93bfa8e37701ff4c64237e4db2045bbefb74
+ f54718774782453f8dfce92e55177663dbc8f49d8da668b0f745b98f0ca854f2"

From a10f4ae15af718078ca0125fce801de8064466b1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 6 May 2019 15:55:24 -0500
Subject: [PATCH 286/752] New package: libsixel-1.8.6

Closes #27475.
---
 common/shlibs             |  1 +
 srcpkgs/libsixel-devel    |  1 +
 srcpkgs/libsixel-util     |  1 +
 srcpkgs/libsixel/template | 40 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/libsixel-devel
 create mode 120000 srcpkgs/libsixel-util
 create mode 100644 srcpkgs/libsixel/template

diff --git a/common/shlibs b/common/shlibs
index bfffb675aea..de5cb65426e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4046,3 +4046,4 @@ libsmb-transport-samba4.so samba-libs-4.13.2_1
 libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libsixel.so.1 libsixel-1.8.6_1
diff --git a/srcpkgs/libsixel-devel b/srcpkgs/libsixel-devel
new file mode 120000
index 00000000000..3c9f7311a4e
--- /dev/null
+++ b/srcpkgs/libsixel-devel
@@ -0,0 +1 @@
+libsixel
\ No newline at end of file
diff --git a/srcpkgs/libsixel-util b/srcpkgs/libsixel-util
new file mode 120000
index 00000000000..3c9f7311a4e
--- /dev/null
+++ b/srcpkgs/libsixel-util
@@ -0,0 +1 @@
+libsixel
\ No newline at end of file
diff --git a/srcpkgs/libsixel/template b/srcpkgs/libsixel/template
new file mode 100644
index 00000000000..8523f3b50ec
--- /dev/null
+++ b/srcpkgs/libsixel/template
@@ -0,0 +1,40 @@
+# Template file for 'libsixel'
+pkgname=libsixel
+version=1.8.6
+revision=1
+build_style=gnu-configure
+makedepends="libpng-devel zlib-devel libjpeg-turbo-devel"
+short_desc="SIXEL encoder/decoder"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/saitoha/libsixel"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=37611d60c7dbcee701346967336dbf135fdd5041024d5f650d52fae14c731ab9
+
+libsixel-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/libsixel-config
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
+
+libsixel-util_package() {
+	short_desc+=" - utilities"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/img2sixel
+		vmove usr/bin/sixel2png
+		vmove usr/share/bash-completion
+		vmove usr/share/zsh
+		vmove usr/share/man/man1
+	}
+}
+
+post_install() {
+	vlicense LICENSE
+}

From f4cd009f99c64478970e3789ad36105b33c28d31 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Dec 2020 12:53:57 -0600
Subject: [PATCH 287/752] libratbag: update to 0.15.

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

diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template
index 43019a3c999..370d670157f 100644
--- a/srcpkgs/libratbag/template
+++ b/srcpkgs/libratbag/template
@@ -1,6 +1,6 @@
 # Template file for 'libratbag'
 pkgname=libratbag
-version=0.14
+version=0.15
 revision=1
 build_style=meson
 configure_args="-Dtests=false -Dsystemd-unit-dir=''
@@ -15,7 +15,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://github.com/libratbag/libratbag"
 distfiles="https://github.com/libratbag/libratbag/archive/v${version}.tar.gz"
-checksum=7767330c7c5d41beab99d3d14439a47aea9bcd83fda456e55a6b114e55c44812
+checksum=9e6ad8d54daef8cc0f44784bdde9bf5a3879d8a66d11e0b990b87266f81f7329
 
 post_install() {
 	vsv ratbagd

From 0c7fd583e8b6a83e54df6eecf743b6cabeed82d5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 8 Jan 2021 11:47:11 -0600
Subject: [PATCH 288/752] php: update to 7.4.14.

Closes #26019.
---
 srcpkgs/php/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 613e0215751..5dcb53d2c6e 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
-version=7.4.11
-revision=2
+version=7.4.14
+revision=1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-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=5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce
+checksum=f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886
 
 conf_files="/etc/php/php.ini"
 

From f9039559a1f6918044615c96602164a8c68a6c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 289/752] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 797f4e07c50f16e76e08705f6511081e3a819345 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 17:47:38 -0500
Subject: [PATCH 290/752] chromium: update to 87.0.4280.141.

Disable gold globally since it is now broken on i686, x86_64, and musl.
---
 srcpkgs/chromium/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 7cb351b6f26..5e4d8129e5d 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=87.0.4280.88
+version=87.0.4280.141
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0
+checksum=147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
 nocross=yes
 
 lib32disabled=yes
@@ -223,12 +223,8 @@ do_configure() {
 		'use_lld=false'
 	)
 
-	# XXX: gold broken with musl and i686
-	case "${XBPS_TARGET_MACHINE}" in
-	*-musl) conf+=( 'use_gold=false' ) ;;
-	i686*) conf+=( 'use_gold=false' ) ;;
-	*) conf+=( 'use_gold=true' ) ;;
-	esac
+	# XXX: gold broken with musl, i686, and x86_64 so disable globally
+	conf+=( 'use_gold=false' )
 
 	# Always support proprietary codecs.
 	# Enable H.264 support in bundled ffmpeg.

From 925e7b8e1f7a087434624fc39eb21b924c17465f Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 17:49:32 -0500
Subject: [PATCH 291/752] chromium-widevine: update to 87.0.4280.141.

---
 srcpkgs/chromium-widevine/INSTALL  | 2 +-
 srcpkgs/chromium-widevine/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index 1f63fd0f44c..d4723ffdf1f 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=4bc68502dc5e22d5c264b3fb5d0a1ecfdadc3ba21d945646d8d37de4b8a96e58
+checksum=b7edb7cd5c166bf3c0a1d245baa5924e242c3b81b97090468bec778f41f40373
 _baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
 _filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
 DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index 32ede6c8bda..be13eec954a 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=87.0.4280.88
+version=87.0.4280.141
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From a164020a52459e31ea2c27907fb9c269b7c8eec4 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Mon, 4 Jan 2021 23:28:45 -0500
Subject: [PATCH 292/752] wine: Use MinGW to build WinPE DLLs

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e6629f4c3e..fd03474eba9 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc5
-revision=1
+revision=2
 wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
@@ -12,6 +12,10 @@ homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
 checksum=f1f10a0aef4dcc9cf4ec67f0828fc1f7f364e2e8e7c2f027c253c8e2004bf451
 
+build_options="mingw"
+build_options_default="mingw"
+desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+
 lib32mode=full
 archs="i686* x86_64*"
 
@@ -23,7 +27,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 	_nopie=yes
 fi
 
-hostmakedepends="pkg-config flex gettext"
+hostmakedepends="pkg-config flex gettext
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel

From a83d3f4b006b7f41c4bc37927825054bdadfa176 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 9 Jan 2021 08:54:13 +0100
Subject: [PATCH 293/752] wine: update to 6.0rc6.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index fd03474eba9..be0981ca546 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.0rc5
-revision=2
+version=6.0rc6
+revision=1
 wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
-checksum=f1f10a0aef4dcc9cf4ec67f0828fc1f7f364e2e8e7c2f027c253c8e2004bf451
+checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
 
 build_options="mingw"
 build_options_default="mingw"

From a4ec73441fbfbea6522d1a26839857609df108e3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 9 Jan 2021 09:06:34 +0100
Subject: [PATCH 294/752] filezilla: update to 3.52.0.5.

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

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 013075cd57a..89419db539a 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.52.0.4
+version=3.52.0.5
 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=d5de791616042e31c25a7d9301252b76b22f18c1bc5ad44fc1ab5b0a633db4c0
+checksum=af615c192ada96fb425f97cf348b802419d27696711d3e5123dfa92a19744829
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From baecc8158598090a806373ecf0be51f463a5b2b7 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 9 Jan 2021 09:56:06 +0100
Subject: [PATCH 295/752] obs: update to 26.1.2.

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

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 67c1f670772..830b94bcb6c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=26.1.0
+version=26.1.2
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="obs-studio-${version}"
@@ -17,7 +17,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=c015d9bab1075ecf9c66c066328e291a20ef36880958fb3db6486ebc5ca9c6da
+checksum=bc8b4c61ba4aae87b70c589a6a5b8538e4f03121b31e9b98a2071d9f6006b897
 
 CFLAGS="-fcommon"
 

From 0f6f574a08c67c73fc4339405b84c80e8ea8d932 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:55:29 +0100
Subject: [PATCH 296/752] crawl: update to 0.26.0.

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

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index 1cdaba5c356..e54831d1d85 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.25.1
+version=0.26.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=41ddf73543940a4d16a7f23c618e2f464dd6d3dd3affc999d2412d8af3f01126
+checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
 nocross=yes
 
 post_extract() {
@@ -20,12 +20,9 @@ post_extract() {
 
 do_build() {
 	echo $version >util/release_ver
-	# crashes with relro?
-	make ${makejobs} CC="$CC" CXX="$CXX" \
-		EXTERNAL_FLAGS="$CFLAGS" V=1 build-rltiles
 	make ${makejobs} CC="$CC" CXX="$CXX" \
 		EXTERNAL_FLAGS="$CFLAGS" EXTERNAL_LDFLAGS="$LDFLAGS" \
-		${make_build_args} V=1 DESTDIR=${DESTDIR}
+		${make_build_args} V=1 NO_TRY_GOLD=1 DESTDIR=${DESTDIR}
 }
 
 do_install() {

From c652af9b9916e7406f78e8e216fc1aa817072c8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:55:31 +0100
Subject: [PATCH 297/752] crawl-tiles: update to 0.26.0.

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

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 48f96df65c4..af4ec047e10 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.25.1
+version=0.26.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=41ddf73543940a4d16a7f23c618e2f464dd6d3dd3affc999d2412d8af3f01126
+checksum=6306c835246057bf91b6690fde14c2c3433ebe1d526876f96c46fab6dc109d45
 nocross=yes
 
 post_extract() {
@@ -25,12 +25,9 @@ post_extract() {
 
 do_build() {
 	echo $version >util/release_ver
-	# crashes with relro?
-	make ${makejobs} CC="$CC" CXX="$CXX" \
-		${make_build_args} EXTERNAL_FLAGS="$CFLAGS" V=1 build-rltiles
 	make ${makejobs} CC="$CC" CXX="$CXX" \
 		EXTERNAL_FLAGS="$CFLAGS" EXTERNAL_LDFLAGS="$LDFLAGS" \
-		${make_build_args} V=1 DESTDIR=${DESTDIR}
+		${make_build_args} V=1 NO_TRY_GOLD=1 DESTDIR=${DESTDIR}
 }
 
 do_install() {

From 7da7e6456a1b5476ba36d0a10c7adbcf02599c5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:56:32 +0100
Subject: [PATCH 298/752] mcelog: update to 175.

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

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index e9434ac574e..0e0d77b4b7a 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=174
+version=175
 revision=1
 archs="i686* x86_64*"
 conf_files="/etc/mcelog/mcelog.conf"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.mcelog.org/"
 distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=e326eda0c39926cfce89bad459ca631ecf5b778f1d7064c5fd677a7c5d238b65
+checksum=ed25a39bb20178e79e18cc5d3202b198868986ec3e964b6285f6a7bac8469fdf
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From 768adbf75d5cb8399d00702c5caf944d13d96780 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:57:02 +0100
Subject: [PATCH 299/752] python3-boto3: update to 1.16.51.

---
 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 acd9b54e1c2..eb982f6ff10 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.16.47
+version=1.16.51
 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=4cea6387bdde7c3d291ae1734a0530576abbd1e86e6cdf2a7f8d3aa44e9d9d11
+checksum=95160b45df095801b4551f76dbd46496a587effe1e10890ab355be564d67a334
 
 post_install() {
 	vlicense LICENSE

From 535eefd182774cf009b2127748c973daa1442f46 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Jan 2021 12:58:05 +0100
Subject: [PATCH 300/752] rhash: update to 1.4.1.

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

diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 1b434d2fe74..820963e9ede 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,6 +1,6 @@
 # Template file for 'rhash'
 pkgname=rhash
-version=1.4.0
+version=1.4.1
 revision=1
 wrksrc="RHash-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"
 homepage="https://github.com/rhash/RHash"
 distfiles="https://github.com/rhash/RHash/archive/v${version}.tar.gz"
-checksum=2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861
+checksum=430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a297
 make_build_target="all lib-shared"
 make_install_target="install install-lib-shared"
 

From 2c263908de2803c50098dfa5f824827aa8f8892d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 5 Jan 2021 04:38:41 +0100
Subject: [PATCH 301/752] ghc: initial patches for ppc64 elfv2

but ghc seems otherwise kinda broken on big endian, so we will
need more fixes...
---
 .../ghc/patches/no-atomic-64-on-32bit.patch   |  58 +++++
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch      | 199 ++++++++++++++++++
 2 files changed, 257 insertions(+)
 create mode 100644 srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
 create mode 100644 srcpkgs/ghc/patches/ppc64-be-elfv2.patch

diff --git a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
new file mode 100644
index 00000000000..05ca275ea9d
--- /dev/null
+++ b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 00000000000..ac353ed417e
--- /dev/null
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -0,0 +1,199 @@
+From fd191973558cf4aeb0d5ca107357defd6f837c38 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Tue, 5 Jan 2021 04:10:25 +0100
+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 +++++------
+ rts/AdjustorAsm.S                 |  2 +-
+ rts/StgCRun.c                     |  4 ++--
+ rts/StgCRunAsm.S                  |  2 +-
+ 7 files changed, 26 insertions(+), 34 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 41cecf0..ba08bd2 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -190,7 +190,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/configure b/configure
+index 183e661..8aae1bc 100755
+--- a/configure
++++ b/configure
+@@ -9868,7 +9868,7 @@ $as_echo "done" >&6; }
+             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/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
+index ec3c18a..0359be7 100644
+--- a/libraries/ghci/GHCi/InfoTable.hsc
++++ b/libraries/ghci/GHCi/InfoTable.hsc
+@@ -228,30 +228,22 @@ mkJumpToAddr a = case platform of
+                 , fromIntegral w64
+                 , fromIntegral (w64 `shiftR` 32) ]
+     ArchPPC64 ->
+-        -- We use the compiler's register r12 to read the function
+-        -- descriptor and the linker's register r11 as a temporary
+-        -- register to hold the function entry point.
+-        -- In the medium code model the function descriptor
+-        -- is located in the first two gigabytes, i.e. the address
+-        -- of the function pointer is a non-negative 32 bit number.
+-        -- 0x0EADBEEF stands for the address of the function pointer:
+-        --    0:   3d 80 0e ad     lis     r12,0x0EAD
+-        --    4:   61 8c be ef     ori     r12,r12,0xBEEF
+-        --    8:   e9 6c 00 00     ld      r11,0(r12)
+-        --    c:   e8 4c 00 08     ld      r2,8(r12)
+-        --   10:   7d 69 03 a6     mtctr   r11
+-        --   14:   e9 6c 00 10     ld      r11,16(r12)
+-        --   18:   4e 80 04 20     bctr
+-       let  w32 = fromIntegral (funPtrToInt a)
++        -- The ABI requires r12 to point to the function's entry point.
++        -- We use the medium code model where code resides in the first
++        -- two gigabytes, so loading a non-negative32 bit address
++        -- with lis followed by ori is fine.
++        -- 0x0EADBEEF stands for the address:
++        -- 3D800EAD lis r12,0x0EAD
++        -- 618CBEEF ori r12,r12,0xBEEF
++        -- 7D8903A6 mtctr r12
++        -- 4E800420 bctr
++
++        let w32 = fromIntegral (funPtrToInt a)
+             hi16 x = (x `shiftR` 16) .&. 0xFFFF
+             lo16 x = x .&. 0xFFFF
+-       in Right [ 0x3D800000 .|. hi16 w32,
+-                  0x618C0000 .|. lo16 w32,
+-                  0xE96C0000,
+-                  0xE84C0008,
+-                  0x7D6903A6,
+-                  0xE96C0010,
+-                  0x4E800420]
++        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
+               )
+@@ -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;
+  }
+  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/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
+--- a/rts/StgCRun.c
++++ b/rts/StgCRun.c
+@@ -717,7 +717,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)
+@@ -842,7 +842,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
+--- a/rts/StgCRunAsm.S
++++ b/rts/StgCRunAsm.S
+@@ -1,7 +1,7 @@
+ #include "ghcconfig.h"
+ #include "rts/Constants.h"
+ 
+-#if defined(powerpc64le_HOST_ARCH)
++#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
+ # ifdef linux_HOST_OS
+ # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
+ 	.file	"StgCRun.c"
+-- 
+2.30.0
+

From f4d40f47e2ac8e22f5fd158e00b0e6ffe8a9e2c9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Jan 2021 19:52:25 +0100
Subject: [PATCH 302/752] python3-pyqtgraph: update to 0.11.1.

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

diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
index 287a730c93a..89c3e582d1d 100644
--- a/srcpkgs/python3-pyqtgraph/template
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyqtgraph'
 pkgname=python3-pyqtgraph
-version=0.11.0
+version=0.11.1
 revision=1
 wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="http://www.pyqtgraph.org/"
 changelog="https://github.com/pyqtgraph/pyqtgraph/raw/master/CHANGELOG"
 distfiles="https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-${version}.tar.gz"
-checksum=082cdec1e559644e083cd8c5752fc06a18582fb2bebb83cdf6eb8ad33c735535
+checksum=9c103e965fb9398570f07c961030cc20fbb80d516a540011f868600a431c4a0d
 
 post_install() {
 	vlicense LICENSE.txt

From 074254fcc7351da43746153282ff948dd2e3562b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:29 +0100
Subject: [PATCH 303/752] subtle: broken

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

diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index b2f8b67c3c9..28db062ae8a 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -10,6 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://subtle.subforge.org"
 conf_files="/etc/xdg/subtle/subtle.rb"
+broken="source location down"
 
 if [ "$CROSS_BUILD" ]; then
 	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then

From 65b1621923c2de1beaf9056310ef0d34e94a91d9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 19:06:04 +0100
Subject: [PATCH 304/752] libucontext: update to 1.0

---
 common/shlibs                                 |  3 +-
 .../patches/arch-x86-i668_get_thunk_bx.patch  | 20 ----------
 srcpkgs/libucontext/template                  | 37 ++++++++++++-------
 3 files changed, 26 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch

diff --git a/common/shlibs b/common/shlibs
index de5cb65426e..17621bdb846 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2438,7 +2438,8 @@ libgemini.so.17 calligra-gemini-3.2.0_1
 libarpack.so.2 arpack-ng-3.3.0_2
 libfts.so.0 musl-fts-1.2_2
 libobstack.so.1 musl-obstack-1.2.1_1
-libucontext.so.0 libucontext-0.1.1_1
+libucontext.so.1 libucontext-1.0_1
+libucontext_posix.so.1 libucontext-1.0_1
 libgavl.so.1 gavl-1.40_1
 libmxml.so.1 mxml-2.9_1
 libKF5Pty.so.5 kpty-5.26.0_1
diff --git a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
deleted file mode 100644
index 702f06f5b28..00000000000
--- a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- arch/x86/startcontext.S	2020-05-18 05:28:21.000000000 +0200
-+++ arch/x86/startcontext.S	2021-01-02 23:52:32.728187160 +0100
-@@ -18,7 +18,7 @@
- 	cmpl	$0, (%esp)
- 
- 	/* restore global offset table, exit@plt and __setcontext@plt need this */
--	call	__i686.get_pc_thunk.bx
-+	call	i686_get_pc_thunk_bx
- 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
- 
- 	/* if we have no linked context, lets get out of here */
-@@ -35,7 +35,7 @@
- 	/* something is really hosed, call hlt to force termination */
- 	hlt
- 
--__i686.get_pc_thunk.bx:
-+i686_get_pc_thunk_bx:
- 	mov	(%esp), %ebx
- 	ret
- END(__start_context)
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index 738b1e317d0..aa3f130d1e4 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -1,8 +1,7 @@
 # Template file for 'libucontext'
 pkgname=libucontext
-reverts="0.13.1_1"
-version=0.11
-revision=2
+version=1.0
+revision=1
 archs="*-musl"
 wrksrc="${pkgname}-${pkgname}-${version}"
 short_desc="Compatibility layer providing ucontext functions"
@@ -10,27 +9,37 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="ISC"
 homepage="https://github.com/kaniini/libucontext"
 distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
-checksum=ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb
+checksum=23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb
 
 case "${XBPS_TARGET_MACHINE}" in
-arm*)	export LIBUCONTEXT_ARCH="arm";;
-i686*)	export LIBUCONTEXT_ARCH="x86";;
-ppc64*) export LIBUCONTEXT_ARCH="ppc64";;
-ppc*)   export LIBUCONTEXT_ARCH="ppc";;
-mips*)  export LIBUCONTEXT_ARCH="mips";;
-*)	export LIBUCONTEXT_ARCH="${XBPS_TARGET_MACHINE%%-musl}";;
+	x86_64*)  _luctx_arch="x86_64"  ;;
+	i686*)    _luctx_arch="x86"     ;;
+	aarch64*) _luctx_arch="aarch64" ;;
+	arm*)     _luctx_arch="arm"     ;;
+	ppc64*)   _luctx_arch="ppc64"   ;;
+	ppc*)     _luctx_arch="ppc"     ;;
+	mips*64*) _luctx_arch="mips64"  ;;
+	mips*)    _luctx_arch="mips"    ;;
+	riscv64*) _luctx_arch="riscv64" ;;
+	s390x*)   _luctx_arch="s390x"   ;;
+	*) broken="libucontext not available for ${XBPS_TARGET_MACHINE}";;
 esac
 
+# we provide our own CFLAGS, which overwrite all of theirs
+export CFLAGS=" -DEXPORT_UNPREFIXED"
+
 do_build() {
-	make ARCH="${LIBUCONTEXT_ARCH}"
+	make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
 do_check() {
-	make ARCH="${LIBUCONTEXT_ARCH}" check
+	make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" check
 }
 
 do_install() {
-	make ARCH="${LIBUCONTEXT_ARCH}" DESTDIR="${DESTDIR}/usr" install
+	make ARCH="${_luctx_arch}" DESTDIR="${DESTDIR}" LIBDIR="/usr/lib" install
+	# missing from release?
+	ln -s libucontext_posix.so.1 ${DESTDIR}/usr/lib/libucontext_posix.so
 }
 
 post_install() {
@@ -41,6 +50,8 @@ libucontext-devel_package() {
 	depends="libucontext>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 	}

From 9d43aa3ff43c86af26b4dacb1627723e442898f8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:17:21 +0100
Subject: [PATCH 305/752] gcompat: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gcompat/template b/srcpkgs/gcompat/template
index ca523bb2388..3988a933a5a 100644
--- a/srcpkgs/gcompat/template
+++ b/srcpkgs/gcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'gcompat'
 pkgname=gcompat
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="musl-obstack-devel"
@@ -15,11 +15,7 @@ checksum=5bcf8bbe4b417bc66b22a7a3675273aa8834480144338172bbd8e81eaf41a7c4
 
 build_options="libucontext"
 desc_option_libucontext="Build with ucontext support via libucontext"
-
-case "$XBPS_TARGET_MACHINE" in
-	mips*) ;;
-	*) build_options_default+=" libucontext" ;;
-esac
+build_options_default=" libucontext"
 
 # https://sourceware.org/glibc/wiki/ABIList
 # https://wiki.linaro.org/RikuVoipio/LdSoTable

From 041fdaa579d19ddc7407b32f3ca8738515441e10 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:20:38 +0100
Subject: [PATCH 306/752] libunwind: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index f520421b20d..67bd6303e01 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
 # Template file for 'libunwind'
 pkgname=libunwind
 version=1.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="liblzma-devel"

From 4c6a896a21f8cb946fe36c5e643cb2bc19bfa969 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:20:51 +0100
Subject: [PATCH 307/752] geary: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 0bf2fe55363..a74b1ff16cd 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=3.38.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dcontractor=true"

From d074a06b568189b81b7fc628fccac3816cbe1580 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:03 +0100
Subject: [PATCH 308/752] gperftools: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template
index 4d33ff78ed2..de7e9423d34 100644
--- a/srcpkgs/gperftools/template
+++ b/srcpkgs/gperftools/template
@@ -1,7 +1,7 @@
 # Template file for 'gperftools'
 pkgname=gperftools
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libunwind-devel"

From 171366d37fca8104b6743c0020958c86d9477a92 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:20 +0100
Subject: [PATCH 309/752] gstreamer1: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 16f7379fc93..7a5863b2765 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
 version=1.16.2
-revision=1
+revision=2
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"

From 261a24ff0dae7e371a52344d743285064857ba1f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:41 +0100
Subject: [PATCH 310/752] plan9port: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template
index 0e0faa85140..4b4c7efc1aa 100644
--- a/srcpkgs/plan9port/template
+++ b/srcpkgs/plan9port/template
@@ -1,7 +1,7 @@
 # Template file for 'plan9port'
 pkgname=plan9port
 version=20200927
-revision=1
+revision=2
 _githash=291f7411783bf6871b253f3b15ce691eea7a257e
 wrksrc="${pkgname}-${_githash}"
 hostmakedepends="perl which"

From b97b5db9ecfadf62aa6e68c6938d7491515f5e32 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:21:52 +0100
Subject: [PATCH 311/752] ruby: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 79241c6d48f..cd06d004172 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"

From 781f105e1d16a1b351f086fd6df2f19838fd1f1e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:38:26 +0100
Subject: [PATCH 312/752] julia: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 32c8fc41b2a..56eb8f9511d 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,7 +1,7 @@
 # Template file for 'julia'
 pkgname=julia
 version=1.5.3
-revision=1
+revision=2
 archs="i686* x86_64* armv7l* aarch64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share

From 29eb5335e5076c4abd0873d5dafc4933d074020e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:38:42 +0100
Subject: [PATCH 313/752] racket: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 98c5cc93756..85374e7c62f 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
 # Template file for 'racket'
 pkgname=racket
 version=7.7
-revision=2
+revision=3
 build_wrksrc=src
 build_style=gnu-configure
 configure_args="--enable-useprefix --disable-docs"

From a86c1fa0e15474c13c21784afc0a099a86b44585 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 9 Jan 2021 21:59:12 +0100
Subject: [PATCH 314/752] gcc: rebuild for libucontext-1.0

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

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 02a7516002d..4ebca58e89e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=8
+revision=9
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"

From d28ef0dee098b594e51f53850a35c83faf9f999d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:15 +0100
Subject: [PATCH 315/752] filelight: update to 20.12.1.

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

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 8e7a6ab0b64..786f00ef213 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=445197abf17e03f0fcfb70b8be3d8e5b5eb5a7dfafc8fbc3177bd9f860781354
+checksum=91c82cc19aa3541885c1dbe8a849d99d79d7a025fba81de2b0401419f050f14c

From afe7e79bfccf6ad95d74289b0d03beeca7ab18cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:16 +0100
Subject: [PATCH 316/752] kaccounts-integration: update to 20.12.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 8fd130fc16f..b01b00b4118 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=5bc0d40fd52a01bf6d80f7d2db54414dc5bcbf693d1c01e8546e1adaf9137f8d
+checksum=22d5879dff70075092748ae04575de7bd7df025eb9a9298bb39d7027601cbe07
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 980fc3a0dba3a875832900a947a09f57f4db9481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:18 +0100
Subject: [PATCH 317/752] kaccounts-providers: update to 20.12.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 4efb75cd6e2..4309601c6ee 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=77f4394b47e9787f6683dec5519d2118997baa32abcc1a09fbe4b2602d003bdd
+checksum=78a32db7363b44dae0670f50c68febea6698f57ef3d676a745eb542e87c96fb8
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 415973ce73ed64a9486350f63c668e18ec765e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:19 +0100
Subject: [PATCH 318/752] kcachegrind: update to 20.12.1.

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

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index d70535744de..dce27d6d0a0 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=e9543784589d7de2de8bfcd0e398f708f54543a208115ab492843cd996a06ac4
+checksum=b1477c26106d142111b050f542b6b91cc8756eafb0cb2c77cd44b5e56bf0066c
 python_version=2

From fedea96d57238cbd266eb76b54cb156509eb4f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:21 +0100
Subject: [PATCH 319/752] kcron: update to 20.12.1.

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

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 037b3bc7931..3081e78fdac 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=12a688f158d174b94f6ab67fb9e72b86ff5d8d34100f4093e26a837cf7894c87
+checksum=ac850bec99fd0da08b9a3ad7f48c133a4a20aa1b3f1302a799fc75d8155faa07

From 1871e274cdd61c62f94dce2ab59f5f542f967efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:22 +0100
Subject: [PATCH 320/752] kdialog: update to 20.12.1.

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

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index ddbdc929235..a5f7b049123 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=2479ea4a4568314abbefff4d4edb84b2ac437f59805908044d001792efc46a1d
+checksum=c481729a5757d1668da648005b48b711eb4cb6fc7c6e7249343b45ac065bc68e

From 20df5f57d8d8aed349d80fb4b83827b8b6d2de9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:23 +0100
Subject: [PATCH 321/752] keditbookmarks: update to 20.12.1.

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

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 2942b1c65f2..54f2e86f796 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=a17cc82f3698470eade7ed2e9437b2bd4c6b0ede211a5829d130d4e6efe21d90
+checksum=373563cb447a7894acc7aaf8aa7cb39d5ac1d85325a43ac2ad0d7f2ee8fd81a8
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4b429fe84da999c16ce4891e2c98e9d6c78b0f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:25 +0100
Subject: [PATCH 322/752] kfind: update to 20.12.1.

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

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 4490bcfd304..e7adb6e46c0 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=006e6a842b85f4c3387b4333e2eba869d0ae13e0516b069325963630a74b768d
+checksum=b74934cba40298969f3cf7fb620fd8437c8e90f367abe559673e08411bc19d66

From 718486aab0a2a8a2a763179c398c20e26a1d4361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:27 +0100
Subject: [PATCH 323/752] kig: update to 20.12.1.

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

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 0d6a16ab798..432c0423549 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=16f09ee6fde0865ad2fb87528eae8d8ec4ab7e69a35ab43ec25fa91f0e200626
+checksum=3feabd92c5b4975c682e80f0b8038c4447b5f29ad0f2e4b194e70a8126cc445b

From 283ee8ef2fd8c5319c930763695452e6201f4d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:28 +0100
Subject: [PATCH 324/752] kio-gdrive: update to 20.12.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 5e1498b78b8..390276a3216 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=332e60ae9df25cc40b31e7afabc0dc0cadc4129a9204832e5d93cdab4746e52e
+checksum=e07ef1431b2d9b7e12d9c09483c31f1f321351fc88177d1450d7b18c4640b02b

From cea96c3ff4ef5b074b05aa3ea42742464c76476d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:29 +0100
Subject: [PATCH 325/752] kmag: update to 20.12.1.

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

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d44badeabdc..09b3f232050 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=0ade18c35210cd80827ba239a413343663f04efe9974efdf6fe2aa50a3549975
+checksum=12728dbb62fab21f63156859a08fd5694c668025c6b5ecdae7e48ab97cf09f54

From accfc013aa9a69780e76df97907347b6aeb592a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:30 +0100
Subject: [PATCH 326/752] kmix: update to 20.12.1.

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

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index a9cf4ed0594..dd7e40d5417 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=161b743868a4fe3dad42c5a50a9568c61d8e44cf73f1f4f3e53e2de1c8936e72
+checksum=17c5bb01ddb61945439a116fc6615794a97b1e204f245e45b6255b5ec7f832e0

From fe6f423d8a674eca82b722e877fc4d957aca2c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:31 +0100
Subject: [PATCH 327/752] kolourpaint: update to 20.12.1.

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

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 9fbdcb3a380..6117d372f67 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d80940e27155304aa0842fa3c08d72f8e383eb45beff49dc1a66b12b030be4ca
+checksum=5ee17da9790d931953acedeebc434e11edb2f3e9a8593183913b47985c7e5ca8
 
 post_install() {
 	vlicense COPYING

From 06d169fad6261ffec5831c3bde7c4a694693a148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:32 +0100
Subject: [PATCH 328/752] kompare: update to 20.12.1.

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

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 26776ec9332..cbcf20b85ef 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6d838d59031dc91cbd0f690b881ec3b35e70e63a921c5454f709520f8646576a
+checksum=10b32f0556e8094ab6276c66d018310e47be0314c915ad9872f4f7737f43b18d

From ae79f33034ce8f00a18315deaad9861fe586106a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:33 +0100
Subject: [PATCH 329/752] kpat: update to 20.12.1.

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

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index c4cb231d3d0..8b338960fc7 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=c00f9afeb7b2d4e37e626a9379df08f30077d0c1965a674795b099dd11588d8f
+checksum=a9186b51156307060186b9546947f77f9cfe72c287cd863a01b17309f189a3cd
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From bb6016bb91bd229cb7f95f7ad83ff4063dcc3f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:35 +0100
Subject: [PATCH 330/752] kruler: update to 20.12.1.

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

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 7938b90e98c..7fc152eb110 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=4976fdef20abc10e05122f6d284f0b3cd187ce7bf56a3ae286ad693a5d6e259c
+checksum=78c02e727b0fa8d26fe35dfa1a1c479b01061ee7c78df748bccdae438c4e3fca

From 7180754b34063d88f136d558efd2a12518ab6c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:36 +0100
Subject: [PATCH 331/752] ksystemlog: update to 20.12.1.

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

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 43cdc65b6f6..7750d20dabe 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=dd485238d4c2cd0ab2c603d5fc4ec60c6f4603ee5e3876cca577011cd0749508
+checksum=80f51e5dc1dcc6a7479ab4c2a10d39e04ef9ffe822f00e766f8c7182b5d16514
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 96f13076f7c0e9983461859d591f427e69b32ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:37 +0100
Subject: [PATCH 332/752] kteatime: update to 20.12.1.

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

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index dabfd528e5c..93fcf6dda0a 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=fabef94581df93d805c69b62407599a4adf8fe504b60e3c2479db22223e0e9ee
+checksum=fd9b504cc37c4acf495a31c576048a53f735e8d93024e7230be6a3343c1f2c49

From 1a5a13e95f308f0dc8854e5cef38327afdb665e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:38 +0100
Subject: [PATCH 333/752] kturtle: update to 20.12.1.

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

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index a5eb86542e1..bf3d351ed21 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=bf60bff1b207857faa9f970099e447d04962ce8c09018c10f5e6dd07f381e68d
+checksum=6b79f2f60517656501f6af0590f8464d37c698b88b7806c661fb4ac89626598a

From 0ce8875761f00f47979d983caf30e96cc6bf98ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:40 +0100
Subject: [PATCH 334/752] kwalletmanager: update to 20.12.1.

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

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 611212fa0e1..425f3d74adc 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=8253d2bdba00c8e016572296de60452fd0f82944e175d7914d7527131e74b8ee
+checksum=72ab9cd2a53b9cc7db144b712ef18d81b23de3ff6b05d92f961b9bff65174f5b

From 15008bf3bc88ccc6e1c2cd6a08952fa3e96f0528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:41 +0100
Subject: [PATCH 335/752] libkcddb: update to 20.12.1.

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

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 3d24fb7c0d2..96e175a0fce 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=a922f201a9366f66ab3292f3f9e34d03fbd0183a6c23d8b5bd3730b69c567b25
+checksum=f3688d66a3026d5355a340e2d9a9e669d5b70afe187789ca7a0919713c257e1e
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From f9785ad53c9781a10bf4e3bdcd0c3b7aa165802f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:42 +0100
Subject: [PATCH 336/752] libkomparediff2: update to 20.12.1.

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

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 54614d0261f..0cf9e8ac86a 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=8b92b729d2d1c7998b22ffd6a7ae95f46954785d4855ce6cfa7a1fb401cf66ec
+checksum=c3a79ea99dd4f4a72db628f46720049960e6b948f5e14b97a7857e04e1c67412
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f4889728529854d937e294909a7771c9b6ab2c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:43 +0100
Subject: [PATCH 337/752] marble5: update to 20.12.1.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index ef7feaa2e0b..1ab217abc56 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=aa5a7891a7f8d0b6b9abdcbc99fc4dc783f6b93e898b3b9fcbe69b7348c1eb85
+checksum=65c936ceefdd368494778e55a921f9d111e6fabab718b948f3f59ede5f446970
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From e14ade66ffa7042845db5f9e48d70872dfe60644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:44 +0100
Subject: [PATCH 338/752] signon-kwallet-extension: update to 20.12.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 33248ed6dca..b6d18130e12 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=7019c1b9b42930c2b0ab197674eeb435eccf6fef2aeda8b87a989479b1ee1e2e
+checksum=4b762208b8d48c0d56b4605f701ebadc1daa59b16054c238a132f38a6b518854

From a407b225c7f7a9e4077c8ebada7095b01d25dc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:46 +0100
Subject: [PATCH 339/752] svgpart: update to 20.12.1.

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

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 8f67b404942..58a03476fb4 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=bc018419d05078f1ddf5b991c9c76448b1b1722dba914085553bde253b7895f5
+checksum=3eb7fe2ebb6cd32fc86fcb659189dd7e84ecda88019456ef7d8873a58bbbc026

From bef84f7f8d38db1d42739a7ca00c4964f05b6db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:47 +0100
Subject: [PATCH 340/752] umbrello: update to 20.12.1.

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

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 7be67571b49..5744aaa0ce4 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=216bfa1bca11c28d41c3d2f8ba818b03090d138b00def56221d1901bff63b4b7
+checksum=74a787947b670024c8a39fc8fb764fba1e79dfcc2664390b903dd85fb8efdd1d
 python_version=2
 
 pre_configure() {

From 37869dd256013b9617220bfc27ed8f54a69dd031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 9 Jan 2021 23:41:48 +0100
Subject: [PATCH 341/752] yakuake: update to 20.12.1.

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

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index fe96e4d1134..fd176e7eb3a 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=a1a1f914ffb4364ba57dd66daf9366aeb9da8fe0d14b4c41b5a7ad3befdcbb9c
+checksum=4a0d934335ec74e4a09b73792ad7a6587adb035742ef1adbe177f1d07ba2ea0a

From 6be4a6e1501aa78a2d8e441747358b3f6da0c917 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 19 Dec 2020 16:49:32 -0600
Subject: [PATCH 342/752] nvidia340: remove

---
 common/shlibs                            |   3 -
 srcpkgs/nvidia340-dkms                   |   1 -
 srcpkgs/nvidia340-libs                   |   1 -
 srcpkgs/nvidia340-opencl                 |   1 -
 srcpkgs/nvidia340/INSTALL                |   7 -
 srcpkgs/nvidia340/INSTALL.msg            |  15 -
 srcpkgs/nvidia340/REMOVE                 |   7 -
 srcpkgs/nvidia340/files/kernel-5.8.patch |  92 ---
 srcpkgs/nvidia340/files/kernel-5.9.patch | 107 ----
 srcpkgs/nvidia340/files/kernel-5.x.patch | 781 -----------------------
 srcpkgs/nvidia340/files/nvidia-glx.conf  |   4 -
 srcpkgs/nvidia340/template               | 223 -------
 srcpkgs/nvidia340/update                 |   2 -
 srcpkgs/removed-packages/template        |   6 +-
 14 files changed, 5 insertions(+), 1245 deletions(-)
 delete mode 120000 srcpkgs/nvidia340-dkms
 delete mode 120000 srcpkgs/nvidia340-libs
 delete mode 120000 srcpkgs/nvidia340-opencl
 delete mode 100644 srcpkgs/nvidia340/INSTALL
 delete mode 100644 srcpkgs/nvidia340/INSTALL.msg
 delete mode 100644 srcpkgs/nvidia340/REMOVE
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.8.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.9.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.x.patch
 delete mode 100644 srcpkgs/nvidia340/files/nvidia-glx.conf
 delete mode 100644 srcpkgs/nvidia340/template
 delete mode 100644 srcpkgs/nvidia340/update

diff --git a/common/shlibs b/common/shlibs
index 17621bdb846..24c31d8621d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -131,16 +131,13 @@ libbrcmOpenVG.so rpi-userland-20180103_2
 libwayland-egl.so.1 wayland-1.15.0_4
 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
 libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore
-libnvidia-ml.so.1 nvidia340-libs-340.46_1 ignore
 libnvidia-ml.so.1 nvidia390-libs-390.87_1 ignore
 libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
-libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-glsi.so.340.107 nvidia340-libs-340.107_7 ignore
 libnvidia-fatbinaryloader.so.390.138 nvidia390-libs-390.138_1 ignore
 libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
diff --git a/srcpkgs/nvidia340-dkms b/srcpkgs/nvidia340-dkms
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-dkms
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340-libs b/srcpkgs/nvidia340-libs
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-libs
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340-opencl b/srcpkgs/nvidia340-opencl
deleted file mode 120000
index 383d067a70f..00000000000
--- a/srcpkgs/nvidia340-opencl
+++ /dev/null
@@ -1 +0,0 @@
-nvidia340
\ No newline at end of file
diff --git a/srcpkgs/nvidia340/INSTALL b/srcpkgs/nvidia340/INSTALL
deleted file mode 100644
index 6b065bedb4a..00000000000
--- a/srcpkgs/nvidia340/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-post)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia340/INSTALL.msg b/srcpkgs/nvidia340/INSTALL.msg
deleted file mode 100644
index 6301c36edbe..00000000000
--- a/srcpkgs/nvidia340/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-> Remove from your /etc/X11/xorg.conf blocks like this:
-
-Section "Files"
-...
-EndSection
-
-This is known to happen when the configuration is generated by nvidia-xconfig.
-Such a section interferes with the "Files" Section provided by the package.
-
--------------------------------------------------------------------------------
-
-> If you wish to go back to nouveau:
-
-# xbps-remove nvidia340 nvidia340-dkms
-# xbps-install libglvnd
diff --git a/srcpkgs/nvidia340/REMOVE b/srcpkgs/nvidia340/REMOVE
deleted file mode 100644
index e4d494ca015..00000000000
--- a/srcpkgs/nvidia340/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-purge)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia340/files/kernel-5.8.patch b/srcpkgs/nvidia340/files/kernel-5.8.patch
deleted file mode 100644
index 1d8b1a40e1e..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.8.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 2cc3342b4b3c96bcc4062513011d35c079b009a2 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 06:59:59 -0400
-Subject: [PATCH 2/3] kernel-5.8
-
-credit: https://launchpad.net/~kelebek333/+archive/ubuntu/nvidia-legacy/+packages
-extracted from: https://launchpadlibrarian.net/492468557/nvidia-graphics-drivers-340_340.108-1lmtrfocal3_340.108-2lmtrfocal.diff.gz
----
- kernel/nv-linux.h                | 8 ++++++++
- kernel/nvidia-modules-common.mk  | 1 +
- kernel/os-mlock.c                | 8 ++++++++
- kernel/uvm/nvidia_uvm_lite_api.c | 4 ++++
- 4 files changed, 21 insertions(+)
-
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index 83e6433..d055552 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -669,11 +669,19 @@ extern nv_spinlock_t km_lock;
- #  define KM_FREE_RECORD(a,b,c)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+#define NV_VMALLOC(ptr, size)                     \
-+    {                                             \
-+        (ptr) = __vmalloc(size, GFP_KERNEL);      \
-+        VM_ALLOC_RECORD(ptr, size, "vm_vmalloc"); \
-+    }
-+#else
- #define NV_VMALLOC(ptr, size)                               \
-     {                                                       \
-         (ptr) = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);   \
-         VM_ALLOC_RECORD(ptr, size, "vm_vmalloc");           \
-     }
-+#endif
- 
- #define NV_VFREE(ptr, size)                         \
-     {                                               \
-diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk
-index b94591b..0e4c228 100644
---- a/kernel/nvidia-modules-common.mk
-+++ b/kernel/nvidia-modules-common.mk
-@@ -222,6 +222,7 @@ build-sanity-checks:
- define BUILD_MODULE_RULE
-  $(1): build-sanity-checks $(3)
- 	@echo "NVIDIA: calling KBUILD..."; \
-+	touch .nv-kernel.o.cmd; \
- 	$$(MAKE) "CC=$$(CC)" NV_MODULE_SUFFIX=$$(strip $(2)) $$(KBUILD_PARAMS) modules; \
- 	echo "NVIDIA: left KBUILD."; \
- 	if ! [ -f $(1) ]; then \
-diff --git a/kernel/os-mlock.c b/kernel/os-mlock.c
-index 8a1fa2f..fc50543 100644
---- a/kernel/os-mlock.c
-+++ b/kernel/os-mlock.c
-@@ -44,11 +44,19 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
-         return rmStatus;
-     }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+    down_read(&mm->mmap_lock);
-+    ret = NV_GET_USER_PAGES((unsigned long)address,
-+                            page_count, write, force, user_pages, NULL);
-+    up_read(&mm->mmap_lock);
-+    pinned = ret;
-+#else
-     down_read(&mm->mmap_sem);
-     ret = NV_GET_USER_PAGES((unsigned long)address,
-                             page_count, write, force, user_pages, NULL);
-     up_read(&mm->mmap_sem);
-     pinned = ret;
-+#endif
- 
-     if (ret < 0)
-     {
-diff --git a/kernel/uvm/nvidia_uvm_lite_api.c b/kernel/uvm/nvidia_uvm_lite_api.c
-index 8448eb6..97a4818 100644
---- a/kernel/uvm/nvidia_uvm_lite_api.c
-+++ b/kernel/uvm/nvidia_uvm_lite_api.c
-@@ -30,6 +30,10 @@
- #include "uvm_gpu_ops_tests.h"
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+#define mmap_sem mmap_lock
-+#endif
-+
- //
- // nvidia_uvm_lite_api.c
- //
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/kernel-5.9.patch b/srcpkgs/nvidia340/files/kernel-5.9.patch
deleted file mode 100644
index d8584314f24..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.9.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From fea401df7500bfbead5a42b1e74560dbddf2f5a3 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 07:00:35 -0400
-Subject: [PATCH 3/3] kernel-5.9
-
-credit: https://github.com/warpme/minimyth2/blob/master/script/nvidia/nvidia-340.108/files/nvidia-340.108-fix-5.9-kernel-compile.patch
----
- kernel/nv-drm.c               | 8 ++++++++
- kernel/nv-linux.h             | 9 +++++++--
- kernel/nv.c                   | 4 ++++
- kernel/uvm/nvidia_uvm_linux.h | 2 ++
- 4 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 85db07e..f0c1299 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -415,7 +415,11 @@ static struct drm_driver nv_drm_driver = {
-     .set_busid = drm_pci_set_busid,
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    .gem_free_object_unlocked = nv_gem_free,
-+#else
-     .gem_free_object = nv_gem_free,
-+#endif
- 
-     .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
-     .gem_prime_export = drm_gem_prime_export,
-@@ -511,8 +515,12 @@ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
- 
- #if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
-     drm_gem_object_put_unlocked(&nv_obj->base);
-+#else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    drm_gem_object_put_locked(&nv_obj->base);
- #else
-     drm_gem_object_unreference_unlocked(&nv_obj->base);
-+#endif
- #endif
- 
-     status = RM_OK;
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index d055552..524a8fe 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -136,8 +136,10 @@
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
-@@ -2249,10 +2251,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
-                                             pages, vmas, NULL);
- 
-         #else
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+               return get_user_pages_remote(mm, start, nr_pages, flags,
-+                                            pages, vmas, NULL);
-+#else
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas);
--
-+#endif
-         #endif
- 
-         }
-diff --git a/kernel/nv.c b/kernel/nv.c
-index a218f83..be4e0f8 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -2785,7 +2785,11 @@ nvidia_probe
- 
- #if defined(CONFIG_VGA_ARB)
- #if defined(VGA_DEFAULT_DEVICE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
-+    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
-+#else
-     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
-+#endif
- #endif
-     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
- #endif
-diff --git a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
-index 1625209..efc181f 100644
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -158,8 +158,10 @@
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/kernel-5.x.patch b/srcpkgs/nvidia340/files/kernel-5.x.patch
deleted file mode 100644
index d7f763bbe39..00000000000
--- a/srcpkgs/nvidia340/files/kernel-5.x.patch
+++ /dev/null
@@ -1,781 +0,0 @@
-From 2154cc447a2377cfd60a7b7c5b619e689ebf71b1 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Thu, 22 Oct 2020 06:58:53 -0400
-Subject: [PATCH 1/3] kernel-5.7
-
-Contains a bunch of stuff required for things up to 5.7.
-credit: https://gitlab.manjaro.org/packages?utf8=%E2%9C%93&filter=nvidia-340xx
----
- kernel/Makefile              |   5 +
- kernel/conftest.sh           |  81 +++++++++++++
- kernel/dkms.conf             |   8 +-
- kernel/nv-drm.c              | 229 ++++++++++++++++++++++++++++++++++-
- kernel/nv-linux.h            |  49 ++++++++
- kernel/nv-procfs.c           |  20 +++
- kernel/nv-time.h             |   9 +-
- kernel/nv.c                  |   2 +-
- kernel/os-interface.c        |   8 +-
- kernel/uvm/Makefile          |   1 +
- kernel/uvm/conftest.sh       |   4 +
- kernel/uvm/nvidia_uvm_lite.c |  29 ++++-
- 12 files changed, 431 insertions(+), 14 deletions(-)
-
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 125a690..2597080 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -108,12 +108,14 @@ COMPILE_TESTS = \
- 	acquire_console_sem \
- 	console_lock \
- 	kmem_cache_create \
-+	kmem_cache_create_usercopy \
- 	outer_flush_all \
- 	on_each_cpu \
- 	smp_call_function \
- 	nvmap_support \
- 	acpi_evaluate_integer \
- 	ioremap_cache \
-+	ioremap_nocache \
- 	ioremap_wc \
- 	proc_dir_entry \
- 	INIT_WORK \
-@@ -122,6 +124,7 @@ COMPILE_TESTS = \
- 	pci_domain_nr \
- 	pci_dma_mapping_error \
- 	file_operations \
-+	proc_ops \
- 	sg_alloc_table \
- 	sg_init_table \
- 	pci_get_domain_bus_and_slot \
-@@ -147,6 +150,8 @@ COMPILE_TESTS = \
- 	vm_fault_present \
- 	vm_fault_has_address \
- 	drm_driver_unload_has_int_return_type \
-+	drm_get_pci_dev \
-+	drm_pci_init \
- 	drm_legacy_pci_init \
- 	timer_setup \
- 	do_gettimeofday \
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b7a85f0..a5225e5 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -176,6 +176,7 @@ test_headers() {
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/file.h"
- 
-+    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
- 
-     translate_and_find_header_files $HEADERS      $FILES
-@@ -440,6 +441,9 @@ compile_test() {
-             # Determine if the set_memory_array_uc() function is present.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
-@@ -914,6 +918,21 @@ compile_test() {
-             fi
-         ;;
- 
-+        kmem_cache_create_usercopy)
-+            #
-+            # Determine if the kmem_cache_create_usercopy function exists.
-+            #
-+            # This function was added by:
-+            #   2017-06-10  8eb8284b412906181357c2b0110d879d5af95e52
-+            CODE="
-+            #include <linux/slab.h>
-+            void kmem_cache_create_usercopy(void) {
-+                kmem_cache_create_usercopy();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT" "" "functions"
-+        ;;
-+
-         smp_call_function)
-             #
-             # Determine if the smp_call_function() function is
-@@ -1188,6 +1207,22 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_IOREMAP_CACHE_PRESENT" "" "functions"
-         ;;
- 
-+        ioremap_nocache)
-+            #
-+            # Determine if the ioremap_nocache() function is present.
-+            #
-+            # Removed by commit 4bdc0d676a64 ("remove ioremap_nocache and
-+            # devm_ioremap_nocache") in v5.6 (2020-01-06)
-+            #
-+            CODE="
-+            #include <asm/io.h>
-+            void conftest_ioremap_nocache(void) {
-+                ioremap_nocache();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_IOREMAP_NOCACHE_PRESENT" "" "functions"
-+        ;;
-+
-         ioremap_wc)
-             #
-             # Determine if the ioremap_wc() function is present.
-@@ -1371,6 +1406,16 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL" "" "types"
-         ;;
- 
-+        proc_ops)
-+            CODE="
-+            #include <linux/proc_fs.h>
-+            int conftest_proc_ops(void) {
-+                return offsetof(struct proc_ops, proc_open);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_HAVE_PROC_OPS" "" "types"
-+        ;;
-+
-         sg_init_table)
-             #
-             # Determine if the sg_init_table() function is present.
-@@ -2044,6 +2089,42 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_DRIVER_UNLOAD_HAS_INT_RETURN_TYPE" "" "types"
-         ;;
- 
-+        drm_get_pci_dev)
-+            #
-+            # Determine if drm_get_pci_dev() is present.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_PCI_H_PRESENT)
-+            #include <drm/drm_pci.h>
-+            #endif
-+
-+            void conftest_drm_legacy_pci_init(void) {
-+                drm_get_pci_dev();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_GET_PCI_DEV_PRESENT" "" "functions"
-+        ;;
-+
-+        drm_pci_init)
-+            #
-+            # Determine if drm_pci_init() is present.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            void conftest_drm_legacy_pci_init(void) {
-+                drm_pci_init();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_PCI_INIT_PRESENT" "" "functions"
-+        ;;
-+
-         drm_legacy_pci_init)
-             #
-             # Determine if drm_legacy_pci_init() is present. drm_pci_init() was
-diff --git a/kernel/dkms.conf b/kernel/dkms.conf
-index 79a02ae..3140f03 100644
---- a/kernel/dkms.conf
-+++ b/kernel/dkms.conf
-@@ -1,7 +1,13 @@
-+if [ -x /usr/bin/nproc ]; then
-+  num_cpu_cores=$(nproc)
-+else
-+  num_cpu_cores=1
-+fi
-+
- PACKAGE_NAME="nvidia"
- PACKAGE_VERSION="340.108"
- BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
- DEST_MODULE_LOCATION[0]="/kernel/drivers/video"
--MAKE[0]="make module KERNEL_UNAME=${kernelver}"
-+MAKE[0]="make -j$num_cpu_cores module KERNEL_UNAME=${kernelver}"
- CLEAN="make clean"
- AUTOINSTALL="yes"
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 0d1cdbf..85db07e 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -50,9 +50,236 @@
- #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
- #define nv_drm_pci_init drm_legacy_pci_init
- #define nv_drm_pci_exit drm_legacy_pci_exit
--#else
-+#elif defined(NV_DRM_PCI_INIT_PRESENT)
- #define nv_drm_pci_init drm_pci_init
- #define nv_drm_pci_exit drm_pci_exit
-+#else
-+#if defined(NV_DRM_GET_PCI_DEV_PRESENT)
-+#define nv_drm_get_pci_dev drm_get_pci_dev
-+#else
-+#include <drm/drm_agpsupport.h>
-+
-+struct nv_drm_agp_head {
-+    struct agp_kern_info agp_info;
-+    struct list_head memory;
-+    unsigned long mode;
-+    struct agp_bridge_data *bridge;
-+    int enabled;
-+    int acquired;
-+    unsigned long base;
-+    int agp_mtrr;
-+    int cant_use_aperture;
-+    unsigned long page_mask;
-+};
-+
-+struct nv_drm_agp_mem {
-+    unsigned long handle;
-+    struct agp_memory *memory;
-+    unsigned long bound;
-+    int pages;
-+    struct list_head head;
-+};
-+
-+/*
-+ * Code from drm_agp_init/nv_drm_{free,unbind}_agp
-+ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_agpsupport.c
-+ */
-+struct drm_agp_head *nv_drm_agp_init(struct drm_device *dev)
-+{
-+    struct nv_drm_agp_head *head = NULL;
-+
-+    head = kzalloc(sizeof(*head), GFP_KERNEL);
-+    if (!head)
-+        return NULL;
-+    head->bridge = agp_find_bridge(dev->pdev);
-+    if (!head->bridge) {
-+        head->bridge = agp_backend_acquire(dev->pdev);
-+        if (!head->bridge) {
-+            kfree(head);
-+            return NULL;
-+        }
-+        agp_copy_info(head->bridge, &head->agp_info);
-+        agp_backend_release(head->bridge);
-+    } else {
-+        agp_copy_info(head->bridge, &head->agp_info);
-+    }
-+    if (head->agp_info.chipset == NOT_SUPPORTED) {
-+        kfree(head);
-+        return NULL;
-+    }
-+    INIT_LIST_HEAD(&head->memory);
-+    head->cant_use_aperture = head->agp_info.cant_use_aperture;
-+    head->page_mask = head->agp_info.page_mask;
-+    head->base = head->agp_info.aper_base;
-+    return (struct drm_agp_head *)head;
-+}
-+
-+void nv_drm_free_agp(struct agp_memory *handle, int pages)
-+{
-+    agp_free_memory(handle);
-+}
-+
-+int nv_drm_unbind_agp(struct agp_memory *handle)
-+{
-+    return agp_unbind_memory(handle);
-+}
-+
-+/*
-+ * Code from drm_pci_agp_{clear,destroy,init}/drm_get_pci_dev
-+ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_pci.c
-+ */
-+static void nv_drm_pci_agp_init(struct drm_device *dev)
-+{
-+    if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
-+        if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
-+            dev->agp = nv_drm_agp_init(dev);
-+        if (dev->agp) {
-+            dev->agp->agp_mtrr = arch_phys_wc_add(
-+                dev->agp->agp_info.aper_base,
-+                dev->agp->agp_info.aper_size *
-+                1024 * 1024);
-+        }
-+    }
-+}
-+
-+void nv_drm_legacy_agp_clear(struct drm_device *dev)
-+{
-+    struct nv_drm_agp_mem *entry, *tempe;
-+
-+    if (!dev->agp)
-+        return;
-+    if (!drm_core_check_feature(dev, DRIVER_LEGACY))
-+        return;
-+
-+    list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
-+        if (entry->bound)
-+            nv_drm_unbind_agp(entry->memory);
-+        nv_drm_free_agp(entry->memory, entry->pages);
-+        kfree(entry);
-+    }
-+    INIT_LIST_HEAD(&dev->agp->memory);
-+
-+    if (dev->agp->acquired)
-+        drm_agp_release(dev);
-+
-+    dev->agp->acquired = 0;
-+    dev->agp->enabled = 0;
-+}
-+
-+void nv_drm_pci_agp_destroy(struct drm_device *dev)
-+{
-+    if (dev->agp) {
-+        arch_phys_wc_del(dev->agp->agp_mtrr);
-+        nv_drm_legacy_agp_clear(dev);
-+        kfree(dev->agp);
-+        dev->agp = NULL;
-+    }
-+}
-+
-+static int nv_drm_get_pci_dev(struct pci_dev *pdev,
-+               const struct pci_device_id *ent,
-+               struct drm_driver *driver)
-+{
-+    struct drm_device *dev;
-+    int ret;
-+
-+    DRM_DEBUG("\n");
-+
-+    dev = drm_dev_alloc(driver, &pdev->dev);
-+    if (IS_ERR(dev))
-+        return PTR_ERR(dev);
-+
-+    ret = pci_enable_device(pdev);
-+    if (ret)
-+        goto err_free;
-+
-+    dev->pdev = pdev;
-+#ifdef __alpha__
-+    dev->hose = pdev->sysdata;
-+#endif
-+
-+    if (drm_core_check_feature(dev, DRIVER_MODESET))
-+        pci_set_drvdata(pdev, dev);
-+
-+    nv_drm_pci_agp_init(dev);
-+
-+    ret = drm_dev_register(dev, ent->driver_data);
-+    if (ret)
-+        goto err_agp;
-+
-+    /* No locking needed since shadow-attach is single-threaded since it may
-+     * only be called from the per-driver module init hook. */
-+    if (drm_core_check_feature(dev, DRIVER_LEGACY))
-+        list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
-+
-+    return 0;
-+
-+err_agp:
-+    nv_drm_pci_agp_destroy(dev);
-+    pci_disable_device(pdev);
-+err_free:
-+    drm_dev_put(dev);
-+    return ret;
-+}
-+#endif
-+
-+/*
-+ * Code from drm_legacy_pci_{init,exit}
-+ * Extracted from tag: v5.6.3, file: drivers/gpu/drm/drm_pci.c
-+ */
-+int nv_drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
-+{
-+    struct pci_dev *pdev = NULL;
-+    const struct pci_device_id *pid;
-+    int i;
-+
-+    DRM_DEBUG("\n");
-+
-+    if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY)))
-+        return -EINVAL;
-+
-+    /* If not using KMS, fall back to stealth mode manual scanning. */
-+    INIT_LIST_HEAD(&driver->legacy_dev_list);
-+    for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
-+        pid = &pdriver->id_table[i];
-+
-+        /* Loop around setting up a DRM device for each PCI device
-+         * matching our ID and device class.  If we had the internal
-+         * function that pci_get_subsys and pci_get_class used, we'd
-+         * be able to just pass pid in instead of doing a two-stage
-+         * thing.
-+         */
-+        pdev = NULL;
-+        while ((pdev =
-+            pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
-+                       pid->subdevice, pdev)) != NULL) {
-+            if ((pdev->class & pid->class_mask) != pid->class)
-+                continue;
-+
-+            /* stealth mode requires a manual probe */
-+            pci_dev_get(pdev);
-+            nv_drm_get_pci_dev(pdev, pid, driver);
-+        }
-+    }
-+    return 0;
-+}
-+
-+void nv_drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
-+{
-+    struct drm_device *dev, *tmp;
-+    DRM_DEBUG("\n");
-+
-+    if (!(driver->driver_features & DRIVER_LEGACY)) {
-+        WARN_ON(1);
-+    } else {
-+        list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
-+                     legacy_dev_list) {
-+            list_del(&dev->legacy_dev_list);
-+            drm_put_dev(dev);
-+        }
-+    }
-+    DRM_INFO("Module unloaded\n");
-+}
- #endif
- 
- extern nv_linux_state_t *nv_linux_devices;
-diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
-index a1d2c68..83e6433 100644
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -688,11 +688,16 @@ extern nv_spinlock_t km_lock;
-         VM_ALLOC_RECORD(ptr, size, "vm_ioremap"); \
-     }
- 
-+#if defined(NV_IOREMAP_NOCACHE_PRESENT)
- #define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
-     { \
-         (ptr) = ioremap_nocache(physaddr, size); \
-         VM_ALLOC_RECORD(ptr, size, "vm_ioremap_nocache"); \
-     }
-+#else
-+#define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
-+    NV_IOREMAP(ptr, physaddr, size)
-+#endif
- 
- #if defined(NV_IOREMAP_CACHE_PRESENT)
- #define NV_IOREMAP_CACHE(ptr, physaddr, size)            \
-@@ -774,6 +779,17 @@ extern nv_spinlock_t km_lock;
- #error "NV_KMEM_CACHE_CREATE() undefined (kmem_cache_create() unavailable)!"
- #endif
- 
-+#if defined(NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT)
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
-+    {                                                               \
-+        kmem_cache = kmem_cache_create_usercopy(name, sizeof(type), \
-+                        0, 0, 0, sizeof(type), NULL);               \
-+    }
-+#else
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
-+        NV_KMEM_CACHE_CREATE(kmem_cache, name, type)
-+#endif
-+
- #define NV_KMEM_CACHE_ALLOC(ptr, kmem_cache, type)              \
-     {                                                           \
-         (ptr) = kmem_cache_alloc(kmem_cache, GFP_KERNEL);       \
-@@ -1971,6 +1987,19 @@ extern NvU32 nv_assign_gpu_count;
-     })
- #endif
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+#define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
-+   ({                                                                    \
-+        struct proc_dir_entry *__entry;                                  \
-+        int mode = (S_IFREG | S_IRUGO);                                  \
-+        const struct proc_ops *fops = &nv_procfs_##__name##_fops;        \
-+        if (fops->proc_write != 0)                                       \
-+            mode |= S_IWUSR;                                             \
-+        __entry = NV_CREATE_PROC_ENTRY(filename, mode, parent, fops,     \
-+            __data);                                                     \
-+        __entry;                                                         \
-+    })
-+#else
- #define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
-    ({                                                                    \
-         struct proc_dir_entry *__entry;                                  \
-@@ -1982,6 +2011,7 @@ extern NvU32 nv_assign_gpu_count;
-             __data);                                                     \
-         __entry;                                                         \
-     })
-+#endif
- 
- /*
-  * proc_mkdir_mode exists in Linux 2.6.9, but isn't exported until Linux 3.0.
-@@ -2023,6 +2053,24 @@ extern NvU32 nv_assign_gpu_count;
-     remove_proc_entry(entry->name, entry->parent);
- #endif
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+#define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
-+    static int nv_procfs_open_##__name(                                       \
-+        struct inode *inode,                                                  \
-+        struct file *filep                                                    \
-+    )                                                                         \
-+    {                                                                         \
-+        return single_open(filep, nv_procfs_read_##__name,                    \
-+            NV_PDE_DATA(inode));                                              \
-+    }                                                                         \
-+                                                                              \
-+    static const struct proc_ops nv_procfs_##__name##_fops = {                \
-+        .proc_open       = nv_procfs_open_##__name,                           \
-+        .proc_read       = seq_read,                                          \
-+        .proc_lseek      = seq_lseek,                                         \
-+        .proc_release    = single_release,                                    \
-+    };
-+#else
- #define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
-     static int nv_procfs_open_##__name(                                       \
-         struct inode *inode,                                                  \
-@@ -2040,6 +2088,7 @@ extern NvU32 nv_assign_gpu_count;
-         .llseek     = seq_lseek,                                              \
-         .release    = single_release,                                         \
-     };
-+#endif
- 
- #endif  /* CONFIG_PROC_FS */
- 
-diff --git a/kernel/nv-procfs.c b/kernel/nv-procfs.c
-index ebca3e8..9365c3c 100644
---- a/kernel/nv-procfs.c
-+++ b/kernel/nv-procfs.c
-@@ -409,6 +409,15 @@ done:
-     return ((status < 0) ? status : (int)count);
- }
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+static struct proc_ops nv_procfs_registry_fops = {
-+    .proc_open    = nv_procfs_open_registry,
-+    .proc_read    = seq_read,
-+    .proc_write   = nv_procfs_write_file,
-+    .proc_lseek   = seq_lseek,
-+    .proc_release = nv_procfs_close_registry,
-+};
-+#else
- static struct file_operations nv_procfs_registry_fops = {
-     .owner   = THIS_MODULE,
-     .open    = nv_procfs_open_registry,
-@@ -417,6 +426,7 @@ static struct file_operations nv_procfs_registry_fops = {
-     .llseek  = seq_lseek,
-     .release = nv_procfs_close_registry,
- };
-+#endif
- 
- static int
- nv_procfs_read_unbind_lock(
-@@ -538,6 +548,15 @@ done:
-     return rc;
- }
- 
-+#if defined(NV_HAVE_PROC_OPS)
-+static struct proc_ops nv_procfs_unbind_lock_fops = {
-+    .proc_open    = nv_procfs_open_unbind_lock,
-+    .proc_read    = seq_read,
-+    .proc_write   = nv_procfs_write_file,
-+    .proc_lseek   = seq_lseek,
-+    .proc_release = nv_procfs_close_unbind_lock,
-+};
-+#else
- static struct file_operations nv_procfs_unbind_lock_fops = {
-     .owner   = THIS_MODULE,
-     .open    = nv_procfs_open_unbind_lock,
-@@ -546,6 +565,7 @@ static struct file_operations nv_procfs_unbind_lock_fops = {
-     .llseek  = seq_lseek,
-     .release = nv_procfs_close_unbind_lock,
- };
-+#endif
- 
- static int
- nv_procfs_read_text_file(
-diff --git a/kernel/nv-time.h b/kernel/nv-time.h
-index a34ceb2..780f8bc 100644
---- a/kernel/nv-time.h
-+++ b/kernel/nv-time.h
-@@ -28,7 +28,12 @@
- #include <linux/ktime.h>
- #endif
- 
--static inline void nv_gettimeofday(struct timeval *tv)
-+struct nv_timeval {
-+    __kernel_long_t      tv_sec;
-+    __kernel_suseconds_t tv_usec;
-+};
-+
-+static inline void nv_gettimeofday(struct nv_timeval *tv)
- {
- #ifdef NV_DO_GETTIMEOFDAY_PRESENT
-     do_gettimeofday(tv);
-@@ -37,7 +42,7 @@ static inline void nv_gettimeofday(struct timeval *tv)
- 
-     ktime_get_real_ts64(&now);
- 
--    *tv = (struct timeval) {
-+    *tv = (struct nv_timeval) {
-         .tv_sec = now.tv_sec,
-         .tv_usec = now.tv_nsec/1000,
-     };
-diff --git a/kernel/nv.c b/kernel/nv.c
-index a167be9..a218f83 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -752,7 +752,7 @@ int __init nvidia_init_module(void)
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE_USERCOPY(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-diff --git a/kernel/os-interface.c b/kernel/os-interface.c
-index 7190b26..0c0dc05 100644
---- a/kernel/os-interface.c
-+++ b/kernel/os-interface.c
-@@ -439,7 +439,7 @@ RM_STATUS NV_API_CALL os_get_current_time(
-     NvU32 *useconds
- )
- {
--    struct timeval tm;
-+    struct nv_timeval tm;
- 
-     nv_gettimeofday(&tm);
- 
-@@ -474,7 +474,7 @@ RM_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds)
-     unsigned long usec;
- 
- #ifdef NV_CHECK_DELAY_ACCURACY
--    struct timeval tm1, tm2;
-+    struct nv_timeval tm1, tm2;
- 
-     nv_gettimeofday(&tm1);
- #endif
-@@ -514,9 +514,9 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
-     unsigned long MicroSeconds;
-     unsigned long jiffies;
-     unsigned long mdelay_safe_msec;
--    struct timeval tm_end, tm_aux;
-+    struct nv_timeval tm_end, tm_aux;
- #ifdef NV_CHECK_DELAY_ACCURACY
--    struct timeval tm_start;
-+    struct nv_timeval tm_start;
- #endif
- 
-     nv_gettimeofday(&tm_aux);
-diff --git a/kernel/uvm/Makefile b/kernel/uvm/Makefile
-index 0cad8ff..043a08d 100644
---- a/kernel/uvm/Makefile
-+++ b/kernel/uvm/Makefile
-@@ -207,6 +207,7 @@ ccflags-y += $(EXTRA_CFLAGS)
- 
- RM_MODULE_SYMVERS:= $(RM_OUT_DIR)/Module.symvers
- UVM_MODULE_SYMVERS:= $(obj)/Module.symvers
-+KBUILD_EXTRA_SYMBOLS:= $(UVM_MODULE_SYMVERS)
- 
- module $(MODULE_NAME).ko: $(UVM_MODULE_SYMVERS) debug_diagnostics_printing
- 
-diff --git a/kernel/uvm/conftest.sh b/kernel/uvm/conftest.sh
-index b7a85f0..33e2a63 100755
---- a/kernel/uvm/conftest.sh
-+++ b/kernel/uvm/conftest.sh
-@@ -176,6 +176,7 @@ test_headers() {
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/file.h"
- 
-+    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
- 
-     translate_and_find_header_files $HEADERS      $FILES
-@@ -440,6 +441,9 @@ compile_test() {
-             # Determine if the set_memory_array_uc() function is present.
-             #
-             CODE="
-+            #if defined(NV_ASM_PGTABLE_H_PRESENT)
-+            #include <asm/pgtable.h>
-+            #endif
-             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
-             #include <asm/set_memory.h>
-             #else
-diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
-index 6943e7c..9a7e3b6 100644
---- a/kernel/uvm/nvidia_uvm_lite.c
-+++ b/kernel/uvm/nvidia_uvm_lite.c
-@@ -131,8 +131,8 @@ static
- RM_STATUS _preexisting_error_on_channel(UvmGpuMigrationTracking *pMigTracker,
-                                          UvmCommitRecord *pRecord);
- 
--static void _set_timeout_in_usec(struct timeval *src,
--                                 struct timeval *result,
-+static void _set_timeout_in_usec(struct nv_timeval *src,
-+                                 struct nv_timeval *result,
-                                  unsigned long timeoutInUsec)
- {
-     if (!src || !result)
-@@ -820,7 +820,13 @@ done:
- }
- 
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+vm_fault_t _fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+int _fault(struct vm_fault *vmf)
-+#else
- int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_FAULT_HAS_ADDRESS)
-     unsigned long vaddr = vmf->address;
-@@ -828,8 +834,15 @@ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-     unsigned long vaddr = (unsigned long)vmf->virtual_address;
- #endif
-     struct page *page = NULL;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+    vm_fault_t retval;
-+#else
-     int retval;
- 
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+   struct vm_area_struct *vma = vmf->vma;
-+#endif
-     retval = _fault_common(vma, vaddr, &page, vmf->flags);
- 
-     vmf->page = page;
-@@ -868,7 +881,13 @@ static struct vm_operations_struct uvmlite_vma_ops =
- // it's dealing with anonymous mapping (see handle_pte_fault).
- //
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+vm_fault_t _sigbus_fault(struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+int _sigbus_fault(struct vm_fault *vmf)
-+#else
- int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+#endif
- {
-     vmf->page = NULL;
-     return VM_FAULT_SIGBUS;
-@@ -1992,9 +2011,9 @@ void umvlite_destroy_per_process_gpu_resources(UvmGpuUuid *gpuUuidStruct)
- static RM_STATUS _check_ecc_errors(UvmGpuMigrationTracking *pMigTracker,
-                                     NvBool *pIsEccErrorSet)
- {
--    struct timeval eccErrorStartTime = {0};
--    struct timeval eccErrorCurrentTime = {0};
--    struct timeval eccTimeout = {0};
-+    struct nv_timeval eccErrorStartTime = {0};
-+    struct nv_timeval eccErrorCurrentTime = {0};
-+    struct nv_timeval eccTimeout = {0};
-     NvBool bEccErrorTimeout = NV_FALSE;
-     NvBool bEccIncomingError = NV_FALSE;
-     unsigned rmInterruptSet = 0;
--- 
-2.29.0
-
diff --git a/srcpkgs/nvidia340/files/nvidia-glx.conf b/srcpkgs/nvidia340/files/nvidia-glx.conf
deleted file mode 100644
index 7c76883abb3..00000000000
--- a/srcpkgs/nvidia340/files/nvidia-glx.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Files"
-    ModulePath "/usr/lib/nvidia/xorg"
-    ModulePath "/usr/lib/xorg/modules"
-EndSection
diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template
deleted file mode 100644
index 166f35756bc..00000000000
--- a/srcpkgs/nvidia340/template
+++ /dev/null
@@ -1,223 +0,0 @@
-# Template file for 'nvidia340'
-
-_desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)"
-
-pkgname=nvidia340
-version=340.108
-revision=4
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:NVIDIA proprietary"
-homepage="http://www.nvidia.com"
-
-archs="i686 x86_64"
-nopie=yes
-repository=nonfree
-create_wrksrc=yes
-short_desc="${_desc} - Libraries and Utilities"
-hostmakedepends="tar"
-depends="${pkgname}-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0 xserver-abi-video>24_1"
-
-provides="nvidia-${version}_${revision}"
-replaces="nvidia>=0 nvidia-stable>=0"
-subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
-
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	_pkg="NVIDIA-Linux-x86-${version}"
-	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
-else
-	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
-	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=995d44fef587ff5284497a47a95d71adbee0c13020d615e940ac928f180f5b77
-fi
-
-do_extract() {
-	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
-	cd ${wrksrc}
-	./${_pkg}.run --extract-only
-	rm -f ${_pkg}.run
-}
-
-do_patch() {
-	cd ${_pkg}
-	patch -p1 < ${FILESDIR}/kernel-5.x.patch
-	patch -p1 < ${FILESDIR}/kernel-5.8.patch
-	patch -p1 < ${FILESDIR}/kernel-5.9.patch
-}
-
-do_install() {
-	cd ${_pkg}
-
-	# X driver
-	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
-
-	# GLX extension module for X
-	vinstall libglx.so.${version} 755 usr/lib/nvidia/xorg
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so.1
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so
-	# Override default ModulePath to load nvidia's glx instead of xorg's
-	vinstall ${FILESDIR}/nvidia-glx.conf 644 /usr/share/X11/xorg.conf.d 10-nvidia-glx.conf
-
-	# OpenGL libraries (GL, EGL and GLES)
-	vinstall libGL.so.${version} 755 usr/lib
-	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so.1
-	vinstall libEGL.so.${version} 755 usr/lib
-	ln -sf libEGL.so.${version} ${DESTDIR}/usr/lib/libEGL.so.1
-	vinstall libGLESv1_CM.so.${version} 755 usr/lib
-	ln -sf libGLESv1_CM.so.${version} ${DESTDIR}/usr/lib/libGLESv1_CM.so.1
-	vinstall libGLESv2.so.${version} 755 usr/lib
-	ln -sf libGLESv2.so.${version} ${DESTDIR}/usr/lib/libGLESv2.so.2
-	# Some programs link to these libglvnd links
-	ln -sf libGL.so.1 ${DESTDIR}/usr/lib/libOpenGL.so.0
-	ln -sf libGL.so.1 ${DESTDIR}/usr/lib/libGLX.so.0
-
-	# OpenGL core library
-	vinstall libnvidia-glcore.so.${version} 755 usr/lib
-	ln -sf libnvidia-glcore.so.${version} ${DESTDIR}/usr/lib/libnvidia-glcore.so
-
-	# VDPAU
-	vinstall libvdpau_nvidia.so.${version} 755 usr/lib/vdpau
-	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so
-	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so.1
-
-	# misc libraries
-	vinstall tls/libnvidia-tls.so.${version} 755 usr/lib
-	ln -sf libnvidia-tls.so.${version} ${DESTDIR}/usr/lib/libnvidia-tls.so
-
-	vinstall libnvidia-cfg.so.${version} 755 usr/lib
-	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so
-	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so.1
-
-	vinstall libnvidia-ml.so.${version} 755 usr/lib
-	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so
-	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so.1
-
-	vinstall libnvidia-encode.so.${version} 755 usr/lib
-	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so
-	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so.1
-
-	vinstall libnvidia-ifr.so.${version} 755 usr/lib
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so
-	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so.1
-
-	vinstall libnvidia-fbc.so.${version} 755 usr/lib
-	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so
-	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so.1
-
-	vinstall libnvidia-glsi.so.${version} 755 usr/lib
-
-	# CUDA
-	vbin nvidia-cuda-mps-control
-	vbin nvidia-cuda-mps-server
-	vman nvidia-cuda-mps-control.1.gz
-
-	vinstall libcuda.so.${version} 755 usr/lib
-	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so
-	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so.1
-
-	vinstall libnvcuvid.so.${version} 755 usr/lib
-	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so
-	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so.1
-
-	# nvidia-xconfig
-	vbin nvidia-xconfig
-	vman nvidia-xconfig.1.gz
-
-	# nvidia-settings
-	vbin nvidia-settings
-	vman nvidia-settings.1.gz
-	vinstall nvidia-settings.desktop 644 usr/share/applications
-	vinstall nvidia-settings.png 644 usr/share/pixmaps
-	sed -e 's:__UTILS_PATH__:/usr/bin:' \
-		-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
-		-i ${DESTDIR}/usr/share/applications/nvidia-settings.desktop
-
-	# nvidia-bug-report
-	vbin nvidia-bug-report.sh nvidia-bug-report
-	vbin nvidia-debugdump
-
-	# nvidia-smi
-	vbin nvidia-smi
-	vman nvidia-smi.1.gz
-
-	# License and documentation.
-	vlicense LICENSE
-	vdoc README.txt README
-	vdoc NVIDIA_Changelog
-
-	# opencl pkg
-	vinstall nvidia.icd 644 etc/OpenCL/vendors
-
-	vinstall libnvidia-compiler.so.${version} 755 usr/lib
-	ln -sf libnvidia-compiler.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-compiler.so
-	ln -sf libnvidia-compiler.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-compiler.so.1
-
-	vinstall libnvidia-opencl.so.${version} 755 usr/lib
-	ln -sf libnvidia-opencl.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-opencl.so
-	ln -sf libnvidia-opencl.so.${version} \
-		${DESTDIR}/usr/lib/libnvidia-opencl.so.1
-
-	# dkms pkg
-	vmkdir usr/src/nvidia-${version}
-	# add nvidia-uvm dkms submodule too.
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cat kernel/uvm/dkms.conf.fragment >> kernel/dkms.conf
-	fi
-	vcopy "kernel/*" usr/src/nvidia-${version}
-
-	# systemd modules-load.d(5) file.
-	vmkdir usr/lib/modules-load.d
-	echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
-	chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		echo "nvidia-uvm" > ${DESTDIR}/usr/lib/modules-load.d/nvidia-uvm.conf
-		chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia-uvm.conf
-	fi
-
-	# Blacklist nouveau.
-	vmkdir usr/lib/modprobe.d
-	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
-	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
-
-	# Omit drm dracut module too.
-	vmkdir usr/lib/dracut/dracut.conf.d
-	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-}
-
-nvidia340-dkms_package() {
-	short_desc="${_desc} - DKMS kernel module"
-	dkms_modules="nvidia ${version}"
-	depends="dkms"
-	provides="nvidia-dkms-${version}_${revision}"
-	replaces="nvidia-dkms>=0 nvidia-stable-dkms>=0"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules-load.d
-		vmove usr/lib/modprobe.d
-		vmove usr/lib/dracut
-	}
-}
-nvidia340-opencl_package() {
-	short_desc="${_desc} - OpenCL implementation"
-	provides="nvidia-opencl-${version}_${revision}"
-	replaces="nvidia-opencl>=0 nvidia-stable-opencl>=0"
-	depends="libOpenCL"
-	pkg_install() {
-		vmove "usr/lib/libnvidia-compiler*"
-		vmove "usr/lib/libnvidia-opencl*"
-		vmove etc/OpenCL
-	}
-}
-nvidia340-libs_package() {
-	short_desc="${_desc} - libraries"
-	provides="libGL-7.11_1 libEGL-7.11_1 libGLES-7.11_1 libglvnd-1.3.0_1"
-	shlib_provides="libGLX.so.0 libOpenGL.so.0"
-	replaces="libGL>=0 libEGL>=0 libGLES>=0 libglvnd>=0"
-	pkg_install() {
-		vmove usr/lib
-	}
-}
diff --git a/srcpkgs/nvidia340/update b/srcpkgs/nvidia340/update
deleted file mode 100644
index 43bad67f7e8..00000000000
--- a/srcpkgs/nvidia340/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='340.+>\K[\d.]+(?=</A>)'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e07c160eafe..c3b79f436a5 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=6
+revision=7
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -78,6 +78,10 @@ replaces="
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
  yt-play<=20140117_2
+ nvidia340<=340.108_4
+ nvidia340-dkms<=340.108_4
+ nvidia340-opencl<=340.108_4
+ nvidia340-libs<=340.108_4
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 2be8a0a34de2351c79a0da6397758fa79d36dd16 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 9 Jan 2021 22:13:36 +0100
Subject: [PATCH 343/752] sway: new maintainer.

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

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 84effd28b25..98ade688f1e 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -9,7 +9,7 @@ makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel"
 depends="swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"

From bfc6b296d685ed9d3edae444e16df5a28c2bce18 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 15:43:54 +0100
Subject: [PATCH 344/752] binutils: backport patch

this should fix chromium link on i686
---
 ...e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch | 60 +++++++++++++++++++
 srcpkgs/binutils/template                     |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch

diff --git a/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
new file mode 100644
index 00000000000..a55432d83cf
--- /dev/null
+++ b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
@@ -0,0 +1,60 @@
+From 1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 16 Nov 2020 06:37:53 -0800
+Subject: [PATCH] elf: Set rel_from_abs to 1 for __ehdr_start
+
+bfdlink.h has
+
+  /* Symbol will be converted from absolute to section-relative.  Set for
+     symbols defined by a script from "dot" (also SEGMENT_START or ORIGIN)
+     outside of an output section statement.  */
+  unsigned int rel_from_abs : 1;
+
+linker.c has
+
+.{* Return TRUE if the symbol described by a linker hash entry H
+.   is going to be absolute.  Linker-script defined symbols can be
+.   converted from absolute to section-relative ones late in the
+.   link.  Use this macro to correctly determine whether the symbol
+.   will actually end up absolute in output.  *}
+.#define bfd_is_abs_symbol(H) \
+.  (((H)->type == bfd_link_hash_defined \
+.    || (H)->type == bfd_link_hash_defweak) \
+.   && bfd_is_abs_section ((H)->u.def.section) \
+.   && !(H)->rel_from_abs)
+.
+
+Set rel_from_abs to 1 for __ehdr_start which will be converted from
+absolute to section-relative in assign_file_positions_for_load_sections.
+
+	PR ld/26869
+	* ldelf.c (ldelf_before_allocation): Set rel_from_abs to 1 for
+	__ehdr_start.
+	* testsuite/ld-i386/i386.exp: Run pr26869.
+	* testsuite/ld-i386/pr26869.d: New file.
+	* testsuite/ld-i386/pr26869.s: Likewise.
+
+(cherry picked from commit cbd5b99cce073273f668b154d4514e8e7e7ccc51)
+---
+ ld/ChangeLog                   |  9 +++++++++
+ ld/ldelf.c                     |  2 ++
+ ld/testsuite/ld-i386/i386.exp  |  1 +
+ ld/testsuite/ld-i386/pr26869.d | 14 ++++++++++++++
+ ld/testsuite/ld-i386/pr26869.s |  3 +++
+ 5 files changed, 29 insertions(+)
+ create mode 100644 ld/testsuite/ld-i386/pr26869.d
+ create mode 100644 ld/testsuite/ld-i386/pr26869.s
+
+diff --git a/ld/ldelf.c b/ld/ldelf.c
+index bada3ade2d7..831d032fe56 100644
+--- a/ld/ldelf.c
++++ b/ld/ldelf.c
+@@ -1589,6 +1589,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
+ 		      (char *) &ehdr_start->u + sizeof ehdr_start->u.def.next,
+ 		      sizeof ehdr_start_save_u);
+ 	      ehdr_start->type = bfd_link_hash_defined;
++	      /* It will be converted to section-relative later.  */
++	      ehdr_start->rel_from_abs = 1;
+ 	      ehdr_start->u.def.section = bfd_abs_section_ptr;
+ 	      ehdr_start->u.def.value = 0;
+ 	    }
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 0e6463ad431..b87e20315fb 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.35.1
-revision=1
+revision=2
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6a57437f8fcb854bdf68b2f2941d1e6a2e9cc339 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 15:44:38 +0100
Subject: [PATCH 345/752] chromium: broken on i686 until binutils is rebuilt

---
 srcpkgs/chromium/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 5e4d8129e5d..10b2c6c2d18 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -45,6 +45,10 @@ esac
 
 build_options_default="clang js_optimize vaapi pulseaudio pipewire"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="until binutils update is done";;
+esac
+
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do

From 81523f6da830b57ba4b338a4692bb0b0666bfbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 15:45:35 +0100
Subject: [PATCH 346/752] orion: update to 1.6.7

Add remaining patches from the archived repository.
---
 ...280a83521ac29a1438e05e8f7a331842bcb4.patch | 400 ++++++++++++++++++
 ...0bbd4a856ea45c770f882be9e63a663a9acd.patch |  32 ++
 ...b86f241df9e17238833c091992c80bb1d298.patch |  14 +
 srcpkgs/orion/patches/cpp.patch               |  11 -
 srcpkgs/orion/patches/mpv-setlocale.patch     |  14 -
 srcpkgs/orion/template                        |   4 +-
 6 files changed, 448 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
 create mode 100644 srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
 create mode 100644 srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
 delete mode 100644 srcpkgs/orion/patches/cpp.patch
 delete mode 100644 srcpkgs/orion/patches/mpv-setlocale.patch

diff --git a/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
new file mode 100644
index 00000000000..67f7f15a163
--- /dev/null
+++ b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch
@@ -0,0 +1,400 @@
+--- src/player/mpvobject.h
++++ src/player/mpvobject.h
+@@ -21,7 +21,7 @@ typedef mpv_opengl_cb_context mpv_context;
+ typedef mpv_render_context mpv_context;
+ #endif
+ 
+-#include <mpv/qthelper.hpp>
++#include "qthelper.hpp"
+ 
+ class MpvRenderer;
+
+--- /dev/null
++++ src/player/qthelper.hpp
+@@ -0,0 +1,386 @@
++/* Copyright (C) 2017 the mpv developers
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef MPV_CLIENT_API_QTHELPER_H_
++#define MPV_CLIENT_API_QTHELPER_H_
++
++#include <mpv/client.h>
++
++#if !MPV_ENABLE_DEPRECATED
++#error "This helper is deprecated. Copy it into your project instead."
++#else
++
++/**
++ * Note: these helpers are provided for convenience for C++/Qt applications.
++ * This is based on the public API in client.h, and it does not encode any
++ * knowledge that is not known or guaranteed outside of the C client API. You
++ * can even copy and modify this code as you like, or implement similar things
++ * for other languages.
++ */
++
++#include <cstring>
++
++#include <QVariant>
++#include <QString>
++#include <QList>
++#include <QHash>
++#include <QSharedPointer>
++#include <QMetaType>
++
++namespace mpv {
++namespace qt {
++
++// Wrapper around mpv_handle. Does refcounting under the hood.
++class Handle
++{
++    struct container {
++        container(mpv_handle *h) : mpv(h) {}
++        ~container() { mpv_terminate_destroy(mpv); }
++        mpv_handle *mpv;
++    };
++    QSharedPointer<container> sptr;
++public:
++    // Construct a new Handle from a raw mpv_handle with refcount 1. If the
++    // last Handle goes out of scope, the mpv_handle will be destroyed with
++    // mpv_terminate_destroy().
++    // Never destroy the mpv_handle manually when using this wrapper. You
++    // will create dangling pointers. Just let the wrapper take care of
++    // destroying the mpv_handle.
++    // Never create multiple wrappers from the same raw mpv_handle; copy the
++    // wrapper instead (that's what it's for).
++    static Handle FromRawHandle(mpv_handle *handle) {
++        Handle h;
++        h.sptr = QSharedPointer<container>(new container(handle));
++        return h;
++    }
++
++    // Return the raw handle; for use with the libmpv C API.
++    operator mpv_handle*() const { return sptr ? (*sptr).mpv : 0; }
++};
++
++static inline QVariant node_to_variant(const mpv_node *node)
++{
++    switch (node->format) {
++    case MPV_FORMAT_STRING:
++        return QVariant(QString::fromUtf8(node->u.string));
++    case MPV_FORMAT_FLAG:
++        return QVariant(static_cast<bool>(node->u.flag));
++    case MPV_FORMAT_INT64:
++        return QVariant(static_cast<qlonglong>(node->u.int64));
++    case MPV_FORMAT_DOUBLE:
++        return QVariant(node->u.double_);
++    case MPV_FORMAT_NODE_ARRAY: {
++        mpv_node_list *list = node->u.list;
++        QVariantList qlist;
++        for (int n = 0; n < list->num; n++)
++            qlist.append(node_to_variant(&list->values[n]));
++        return QVariant(qlist);
++    }
++    case MPV_FORMAT_NODE_MAP: {
++        mpv_node_list *list = node->u.list;
++        QVariantMap qmap;
++        for (int n = 0; n < list->num; n++) {
++            qmap.insert(QString::fromUtf8(list->keys[n]),
++                        node_to_variant(&list->values[n]));
++        }
++        return QVariant(qmap);
++    }
++    default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++        return QVariant();
++    }
++}
++
++struct node_builder {
++    node_builder(const QVariant& v) {
++        set(&node_, v);
++    }
++    ~node_builder() {
++        free_node(&node_);
++    }
++    mpv_node *node() { return &node_; }
++private:
++    Q_DISABLE_COPY(node_builder)
++    mpv_node node_;
++    mpv_node_list *create_list(mpv_node *dst, bool is_map, int num) {
++        dst->format = is_map ? MPV_FORMAT_NODE_MAP : MPV_FORMAT_NODE_ARRAY;
++        mpv_node_list *list = new mpv_node_list();
++        dst->u.list = list;
++        if (!list)
++            goto err;
++        list->values = new mpv_node[num]();
++        if (!list->values)
++            goto err;
++        if (is_map) {
++            list->keys = new char*[num]();
++            if (!list->keys)
++                goto err;
++        }
++        return list;
++    err:
++        free_node(dst);
++        return NULL;
++    }
++    char *dup_qstring(const QString &s) {
++        QByteArray b = s.toUtf8();
++        char *r = new char[b.size() + 1];
++        if (r)
++            std::memcpy(r, b.data(), b.size() + 1);
++        return r;
++    }
++    bool test_type(const QVariant &v, QMetaType::Type t) {
++        // The Qt docs say: "Although this function is declared as returning
++        // "QVariant::Type(obsolete), the return value should be interpreted
++        // as QMetaType::Type."
++        // So a cast really seems to be needed to avoid warnings (urgh).
++        return static_cast<int>(v.type()) == static_cast<int>(t);
++    }
++    void set(mpv_node *dst, const QVariant &src) {
++        if (test_type(src, QMetaType::QString)) {
++            dst->format = MPV_FORMAT_STRING;
++            dst->u.string = dup_qstring(src.toString());
++            if (!dst->u.string)
++                goto fail;
++        } else if (test_type(src, QMetaType::Bool)) {
++            dst->format = MPV_FORMAT_FLAG;
++            dst->u.flag = src.toBool() ? 1 : 0;
++        } else if (test_type(src, QMetaType::Int) ||
++                   test_type(src, QMetaType::LongLong) ||
++                   test_type(src, QMetaType::UInt) ||
++                   test_type(src, QMetaType::ULongLong))
++        {
++            dst->format = MPV_FORMAT_INT64;
++            dst->u.int64 = src.toLongLong();
++        } else if (test_type(src, QMetaType::Double)) {
++            dst->format = MPV_FORMAT_DOUBLE;
++            dst->u.double_ = src.toDouble();
++        } else if (src.canConvert<QVariantList>()) {
++            QVariantList qlist = src.toList();
++            mpv_node_list *list = create_list(dst, false, qlist.size());
++            if (!list)
++                goto fail;
++            list->num = qlist.size();
++            for (int n = 0; n < qlist.size(); n++)
++                set(&list->values[n], qlist[n]);
++        } else if (src.canConvert<QVariantMap>()) {
++            QVariantMap qmap = src.toMap();
++            mpv_node_list *list = create_list(dst, true, qmap.size());
++            if (!list)
++                goto fail;
++            list->num = qmap.size();
++            for (int n = 0; n < qmap.size(); n++) {
++                list->keys[n] = dup_qstring(qmap.keys()[n]);
++                if (!list->keys[n]) {
++                    free_node(dst);
++                    goto fail;
++                }
++                set(&list->values[n], qmap.values()[n]);
++            }
++        } else {
++            goto fail;
++        }
++        return;
++    fail:
++        dst->format = MPV_FORMAT_NONE;
++    }
++    void free_node(mpv_node *dst) {
++        switch (dst->format) {
++        case MPV_FORMAT_STRING:
++            delete[] dst->u.string;
++            break;
++        case MPV_FORMAT_NODE_ARRAY:
++        case MPV_FORMAT_NODE_MAP: {
++            mpv_node_list *list = dst->u.list;
++            if (list) {
++                for (int n = 0; n < list->num; n++) {
++                    if (list->keys)
++                        delete[] list->keys[n];
++                    if (list->values)
++                        free_node(&list->values[n]);
++                }
++                delete[] list->keys;
++                delete[] list->values;
++            }
++            delete list;
++            break;
++        }
++        default: ;
++        }
++        dst->format = MPV_FORMAT_NONE;
++    }
++};
++
++/**
++ * RAII wrapper that calls mpv_free_node_contents() on the pointer.
++ */
++struct node_autofree {
++    mpv_node *ptr;
++    node_autofree(mpv_node *a_ptr) : ptr(a_ptr) {}
++    ~node_autofree() { mpv_free_node_contents(ptr); }
++};
++
++#if MPV_ENABLE_DEPRECATED
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @deprecated use get_property() instead
++ *
++ * @param name the property name
++ */
++static inline QVariant get_property_variant(mpv_handle *ctx, const QString &name)
++{
++    mpv_node node;
++    if (mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node) < 0)
++        return QVariant();
++    node_autofree f(&node);
++    return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++
++ * @deprecated use set_property() instead
++ */
++static inline int set_property_variant(mpv_handle *ctx, const QString &name,
++                                       const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * Set the given option as mpv_node converted from the QVariant argument.
++ *
++ * @deprecated use set_property() instead
++ */
++static inline int set_option_variant(mpv_handle *ctx, const QString &name,
++                                     const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_option(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent. Returns QVariant() on error (and
++ * unfortunately, the same on success).
++ *
++ * @deprecated use command() instead
++ */
++static inline QVariant command_variant(mpv_handle *ctx, const QVariant &args)
++{
++    node_builder node(args);
++    mpv_node res;
++    if (mpv_command_node(ctx, node.node(), &res) < 0)
++        return QVariant();
++    node_autofree f(&res);
++    return node_to_variant(&res);
++}
++
++#endif
++
++/**
++ * This is used to return error codes wrapped in QVariant for functions which
++ * return QVariant.
++ *
++ * You can use get_error() or is_error() to extract the error status from a
++ * QVariant value.
++ */
++struct ErrorReturn
++{
++    /**
++     * enum mpv_error value (or a value outside of it if ABI was extended)
++     */
++    int error;
++
++    ErrorReturn() : error(0) {}
++    explicit ErrorReturn(int err) : error(err) {}
++};
++
++/**
++ * Return the mpv error code packed into a QVariant, or 0 (success) if it's not
++ * an error value.
++ *
++ * @return error code (<0) or success (>=0)
++ */
++static inline int get_error(const QVariant &v)
++{
++    if (!v.canConvert<ErrorReturn>())
++        return 0;
++    return v.value<ErrorReturn>().error;
++}
++
++/**
++ * Return whether the QVariant carries a mpv error code.
++ */
++static inline bool is_error(const QVariant &v)
++{
++    return get_error(v) < 0;
++}
++
++/**
++ * Return the given property as mpv_node converted to QVariant, or QVariant()
++ * on error.
++ *
++ * @param name the property name
++ * @return the property value, or an ErrorReturn with the error code
++ */
++static inline QVariant get_property(mpv_handle *ctx, const QString &name)
++{
++    mpv_node node;
++    int err = mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node);
++    if (err < 0)
++        return QVariant::fromValue(ErrorReturn(err));
++    node_autofree f(&node);
++    return node_to_variant(&node);
++}
++
++/**
++ * Set the given property as mpv_node converted from the QVariant argument.
++ *
++ * @return mpv error code (<0 on error, >= 0 on success)
++ */
++static inline int set_property(mpv_handle *ctx, const QString &name,
++                                       const QVariant &v)
++{
++    node_builder node(v);
++    return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
++}
++
++/**
++ * mpv_command_node() equivalent.
++ *
++ * @param args command arguments, with args[0] being the command name as string
++ * @return the property value, or an ErrorReturn with the error code
++ */
++static inline QVariant command(mpv_handle *ctx, const QVariant &args)
++{
++    node_builder node(args);
++    mpv_node res;
++    int err = mpv_command_node(ctx, node.node(), &res);
++    if (err < 0)
++        return QVariant::fromValue(ErrorReturn(err));
++    node_autofree f(&res);
++    return node_to_variant(&res);
++}
++
++}
++}
++
++Q_DECLARE_METATYPE(mpv::qt::ErrorReturn)
++
++#endif /* else #if MPV_ENABLE_DEPRECATED */
++
++#endif
diff --git a/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch b/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
new file mode 100644
index 00000000000..dfa699baedd
--- /dev/null
+++ b/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch
@@ -0,0 +1,32 @@
+--- src/qml/PlayerView.qml
++++ src/qml/PlayerView.qml
+@@ -128,13 +128,27 @@
+ 
+ 
+     function loadAndPlay(){
+-        if (!streamMap) return
++        if (!streamMap) {
++            console.log("streamMap not available yet");
++            return;
++        }
+ 
+         var description = setWatchingTitle();
+ 
+         var start = !isVod ? -1 : seekBar.value
+ 
+-        var url = streamMap[Settings.quality]
++        var quality = Settings.quality;
++        if (!streamMap.hasOwnProperty(quality)) {
++            console.log("no stream for quality", quality);
++            quality = "source";
++            console.log("using", quality);
++        }
++        var url = streamMap[quality]
++
++        if (url == null) {
++            console.error("did not have a playback url");
++            return;
++        }
+ 
+         console.debug("Loading: ", url)
+ 
diff --git a/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch b/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
new file mode 100644
index 00000000000..327ee7036df
--- /dev/null
+++ b/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch
@@ -0,0 +1,14 @@
+--- src/qml/irc/ChatView.qml
++++ src/qml/irc/ChatView.qml
+@@ -280,6 +280,10 @@ Page {
+             }
+ 
+             function lookupEmote(word) {
++                if (_textEmotesMap == null) {
++                    console.log("FIXME: emotes haven't initialized");
++                    return;
++                }
+                 var emoteId = _textEmotesMap[word];
+                 if (emoteId != null) {
+                     return emoteId;
+ 
diff --git a/srcpkgs/orion/patches/cpp.patch b/srcpkgs/orion/patches/cpp.patch
deleted file mode 100644
index 2059c5ed52f..00000000000
--- a/srcpkgs/orion/patches/cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- orion.pro	2018-10-15 16:18:14.000000000 +0200
-+++ -	2019-01-07 16:44:55.286087420 +0100
-@@ -8,7 +8,7 @@
- 
- QMAKE_CXXFLAGS += -Wall -O2
- 
--CONFIG += c++11
-+CONFIG += c++14
- #CONFIG += console
- 
- TARGET = orion
diff --git a/srcpkgs/orion/patches/mpv-setlocale.patch b/srcpkgs/orion/patches/mpv-setlocale.patch
deleted file mode 100644
index 9c55d9bb4c1..00000000000
--- a/srcpkgs/orion/patches/mpv-setlocale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/player/mpvobject.cpp	2018-10-15 16:18:14.000000000 +0200
-+++ -	2019-01-07 16:58:32.132459477 +0100
-@@ -103,8 +103,10 @@
- };
- 
- MpvObject::MpvObject(QQuickItem * parent)
--    : QQuickFramebufferObject(parent), mpv{mpv_create()}, mpv_gl(nullptr)
-+    : QQuickFramebufferObject(parent), mpv_gl(nullptr)
- {
-+    std::setlocale(LC_NUMERIC, "C");
-+    mpv = mpv_create();
-     if (!mpv)
-         throw std::runtime_error("could not create mpv context");
- 
diff --git a/srcpkgs/orion/template b/srcpkgs/orion/template
index 2b0eedb0617..0348a824fc6 100644
--- a/srcpkgs/orion/template
+++ b/srcpkgs/orion/template
@@ -1,6 +1,6 @@
 # Template file for 'orion'
 pkgname=orion
-version=1.6.6
+version=1.6.7
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alamminsalo/orion"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3c8750555e9302e49904c43f35f2c2870a0224a231304c63301b9112471575e1
+checksum=19d9c170d0bcf21d47947704d8c8e927cff5140f94cb840b51d2b8574b0149fb
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-host-tools qt5-declarative-devel qt5-svg-devel qt5-quickcontrols2-devel"

From ce43fd1f0297dd07d7b208cdc2cf1ebdc2f8a68a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Jan 2021 17:17:01 +0100
Subject: [PATCH 347/752] Revert "chromium: broken on i686 until binutils is
 rebuilt"

This reverts commit d294c7b728cd1a4884cb7d2f0b635830099fd945.
---
 srcpkgs/chromium/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 10b2c6c2d18..5e4d8129e5d 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -45,10 +45,6 @@ esac
 
 build_options_default="clang js_optimize vaapi pulseaudio pipewire"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="until binutils update is done";;
-esac
-
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do

From c5be0d5ce28f4689243f64ff202751c93bb3f339 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 11:53:35 -0500
Subject: [PATCH 348/752] polybar: update to 3.5.4.

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

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index db7aa42eaaa..d74bb863063 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,7 +1,7 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.3
-revision=2
+version=3.5.4
+revision=1
 build_style=cmake
 configure_args="
  -DENABLE_ALSA=$(vopt_if alsa ON OFF)
@@ -25,7 +25,7 @@ maintainer="Michael Carlberg <c@rlberg.se>"
 license="MIT"
 homepage="https://github.com/jaagr/polybar"
 distfiles="https://github.com/jaagr/polybar/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=d23fbb9a7b7f1cdd334fe0ba3adc0f9602cfc94aa0827c058584059416792680
+checksum=133af4e8b29f426595ad3b773948eee27275230887844473853e7940c7959c2b
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"

From 9d84f8ae1771910eb5e21956d830953438d1d7ae Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 12:39:57 -0500
Subject: [PATCH 349/752] python3-exifread: update to 2.3.2.

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

diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
index 3e90335a4b2..f90e837d1c0 100644
--- a/srcpkgs/python3-exifread/template
+++ b/srcpkgs/python3-exifread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-exifread'
 pkgname=python3-exifread
-version=2.3.1
-revision=3
+version=2.3.2
+revision=1
 wrksrc="exif-py-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
@@ -11,14 +11,9 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="BSD-3-Clause"
 homepage="https://github.com/ianare/exif-py"
 distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
-checksum=b6b012d72df9af6e8a4fb439914f3a293f0a63c2087c21e94f5b6e1221de45f4
+checksum=b595f8644a456d00df98b2f83b5fe17682bba0e7e9f7c8b39fb7130a80b73b0a
 conflicts="python-exifread>=0"
 
-pre_build() {
-	# Upstream didn't update version in this file
-	sed -i "s/2.1.2/${version}/" exifread/__init__.py
-}
-
 post_install() {
 	vlicense LICENSE.txt
 }

From 2dfbabe727ebdd303764415e1d952dc1da726f8b Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 12:51:13 -0500
Subject: [PATCH 350/752] python3-cachetools: update to 4.2.0.

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

diff --git a/srcpkgs/python3-cachetools/template b/srcpkgs/python3-cachetools/template
index b9af9fafddf..97f3f9c505b 100644
--- a/srcpkgs/python3-cachetools/template
+++ b/srcpkgs/python3-cachetools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cachetools'
 pkgname=python3-cachetools
-version=4.1.1
-revision=2
+version=4.2.0
+revision=1
 wrksrc="cachetools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://github.com/tkem/cachetools/"
 distfiles="${PYPI_SITE}/c/cachetools/cachetools-${version}.tar.gz"
-checksum=bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20
+checksum=3796e1de094f0eaca982441c92ce96c68c89cced4cd97721ab297ea4b16db90e
 
 post_install() {
 	vlicense LICENSE

From 1d4f1f3472264d85b8526ceb05536c08e300873e Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 7 Jan 2021 13:03:40 -0500
Subject: [PATCH 351/752] python3-Telethon: update to 1.19.0.

Add checkdepends.
---
 srcpkgs/python3-Telethon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index 53ba9bc6847..51f404d4806 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
-version=1.18.2
+version=1.19.0
 revision=1
 wrksrc="Telethon-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyaes python3-rsa"
+checkdepends="$depends python3-pytest python3-pytest-asyncio"
 short_desc="Pure Python3 Telegram client library"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://github.com/LonamiWebs/Telethon"
 distfiles="https://github.com/LonamiWebs/Telethon/archive/v${version}.tar.gz"
-checksum=0d1cc66e1fc6b8efd42d3a1dfb02d2b1bd0439905aae75a254a172679bfa5cc6
+checksum=6faccf5ba8ec9da472032188e68e421a26d5f42f4ee5c4cff0b3ecf222b158ca
 
 post_install() {
 	vlicense LICENSE

From b5f396b24a0bdf55dac67fdb6d2c0d81b0860750 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 7 Jan 2021 22:21:31 +0200
Subject: [PATCH 352/752] mtpaint: update to 3.50.01.

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

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 98787e3e22f..39f4f899f33 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50
+version=3.50.01
 revision=1
-_commit=b0b023ba7ae231415d556ea88b2239fecf693faf
+_commit=a4675ff5cd9fcd57d291444cb9f332b48f11243f
 wrksrc="mtPaint-${_commit}"
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="http://mtpaint.sourceforge.net/"
 changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
 distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=b002718b3a5b907edfe6f6d9a1eaaa3287d98bc921da7137e32a4c06c29ae075
+checksum=852e0e8456610596952f168281836ed640275ac0dcd773321ae9a9285077e899
 
 post_install() {
 	vdoc doc/vcode.t2t

From e09baaf7d3a73d72904360af3a52351728d31401 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 10 Jan 2021 01:03:10 +0200
Subject: [PATCH 353/752] hugo: update to 0.80.0.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index b8127316dc7..9b4818c6467 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.79.0
+version=0.80.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=83e9b7e4bd3b321d140d1f35c75eafa6a70d3b814f2cac8e2f78b11feb23f1b2
+checksum=4ddcd6ebea21e5fd4067db4a481ab7810e34496d5991a3520169c8f5ee1d38bb
 
 build_options="pygments extended"
 desc_option_pygments="Alternative syntax highlighter"

From c0a53fe05f6e76dc798b8f28fbe04635955d9ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 21:31:55 +0100
Subject: [PATCH 354/752] trinify: fix build

---
 srcpkgs/trinity/patches/stdint_h.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/trinity/patches/stdint_h.patch

diff --git a/srcpkgs/trinity/patches/stdint_h.patch b/srcpkgs/trinity/patches/stdint_h.patch
new file mode 100644
index 00000000000..e3903954ae1
--- /dev/null
+++ b/srcpkgs/trinity/patches/stdint_h.patch
@@ -0,0 +1,18 @@
+--- syscalls/x86/modify_ldt.c
++++ syscalls/x86/modify_ldt.c
+@@ -5,8 +5,15 @@
+  * asmlinkage int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount)
+  */
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <sys/types.h>
+ #define __ASSEMBLY__ 1
++typedef int16_t  __s16;
++typedef uint16_t __u16;
++typedef int32_t  __s32;
++typedef uint32_t __u32;
++typedef int64_t  __s64;
++typedef uint64_t __u64;
+ #include <asm/ldt.h>
+ #include "sanitise.h"
+ #include "shm.h"

From 305cc1488541bf0542942e760c7808a0cb0a0cd6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Jan 2021 19:47:33 +0100
Subject: [PATCH 355/752] wget: update to 1.21.1

Change the libidn-devel makedep to libidn2-devel. This enables IRI
functionality in wget. libidn wasn't being used at all.

Also make the zlib build-time dependency explicit.

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

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 348efcec677..49fb40112f1 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,12 +1,12 @@
 # Template file for 'wget'
 pkgname=wget
-version=1.21
+version=1.21.1
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
-makedepends="libidn-devel libuuid-devel pcre2-devel
+makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
  $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
 #changelog="https://git.savannah.gnu.org/cgit/wget.git/plain/NEWS"
 homepage="http://www.gnu.org/software/wget/wget.html"
 distfiles="${GNU_SITE}/wget/wget-${version}.tar.gz"
-checksum=b3bc1a9bd0c19836c9709c318d41c19c11215a07514f49f89b40b9d50ab49325
+checksum=59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e
 
 build_options="gnutls ssl"
 build_options_default="ssl"

From edb78ef6772fb285c4265af51e426e15c151fe2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 22:28:58 +0100
Subject: [PATCH 356/752] zita-alsa-pcmi: fix build

---
 srcpkgs/zita-alsa-pcmi/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 6fb16de7a84..2090b4dec82 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -13,6 +13,8 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
 
+CXXFLAGS="-fPIC -DPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 }

From 4ab0c436d5e8e2f1fec1bf213da97e82a4e6e999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 22:29:53 +0100
Subject: [PATCH 357/752] zita-resampler: fix build

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

diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index e54959dfdcb..56bd795af99 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -13,6 +13,8 @@ homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.
 distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
 
+CXXFLAGS="-fPIC -DPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 }

From ba6de2e0178711bb000bae6be9f214e89bdb47af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 10 Jan 2021 22:34:27 +0100
Subject: [PATCH 358/752] timg: fix build

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

diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 3d1ccb81b20..9221bc491df 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -14,6 +14,8 @@ homepage="https://github.com/hzeller/timg"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=436e2c3b5f43e906786ca150d11e521281d558329a7bc00198fe30d6907ee8c4
 
+CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/GraphicsMagick"
+
 do_install() {
 	vbin timg
 }

From 678aa7cf52995ca272dac9fe5586ac62f70f3d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 00:03:15 +0100
Subject: [PATCH 359/752] golangci-lint: update to 1.35.0

Setting LDFLAGS="-fuse-ld=bfd" does no longer work. However all
targets except ppc64le* support using the internal linker instead.

I found no way to make the ppc64le* build work and left it
trying to use the old method.
---
 srcpkgs/golangci-lint/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..199642ac150 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,20 +1,27 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.32.2
+version=1.35.0
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
-_date="$(date --utc --iso-8601=seconds)"
-go_ldflags="-X main.version=${version} -X main.date=${_date} -X main.commit=v${version}"
+go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+checksum=71739de1aa88defc6f08c7e5118705069fee51f4fcf303cb9b7a39215ef0c56d
 
-# Cross builds fail with -fuse-ld=gold
-LDFLAGS="-fuse-ld=bfd"
+# XXX: LDFLAGS="-fuse-ld=bfd" does no longer work when cross compiling
+# 'go build runtime/cgo: invalid flag in go:cgo_ldflag: -fuse-ld=bfd'
+case "$XBPS_TARGET_MACHINE" in
+	ppc*)	# @q66 : ppc64le does not (yet?) support the internal linker
+		LDFLAGS="-fuse-ld=bfd"
+		;;
+	*)	# other targets can use go's internal linker
+		go_ldflags=" -linkmode internal"
+		;;
+esac
 
 post_install() {
 	vdoc README.md

From 6e6c7a7b80d3167785e599d8df67504e9125b4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 02:15:13 +0100
Subject: [PATCH 360/752] kristall: fix build

With build_style=gnu-makefile trying to build 'kristall' errored with:
error "You must build your code with position independent code if Qt was built with -reduce-relocations. "
      "Compile your code with -fPIC (and not with -fPIE)."
Switch to build_style=qmake to make sure all CXXFLAGS are set as required.

Unfortunately the data installation is no separate target in Makefile thus do it in post_install().

The kristall-mime-info.xml file is missing in the tarball yet installed in the Makefile.
Download it from https://github.com/MasterQ32/kristall/blob/master/kristall-mime-info.xml
---
 srcpkgs/kristall/template | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index 182781c2ac3..b5d6dbfb12c 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -2,17 +2,33 @@
 pkgname=kristall
 version=0.3
 revision=1
-build_style=gnu-makefile
-build_helper=qmake
+build_wrksrc=src
+build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel"
 short_desc="Small-Internet Browser"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://kristall.random-projects.net"
-distfiles="https://github.com/MasterQ32/kristall/archive/V${version}.tar.gz"
-checksum=24733402e0e3924459222c87aa2137139ff8ae10410a2a88d56455c5ec172368
+distfiles="https://github.com/MasterQ32/kristall/archive/V${version}.tar.gz
+ https://raw.githubusercontent.com/MasterQ32/kristall/master/kristall-mime-info.xml"
+checksum="24733402e0e3924459222c87aa2137139ff8ae10410a2a88d56455c5ec172368
+ 287f63fb3f1dfa0577fe2efb6f421a3299a928dfe139cb2a05c571aa171c2c9b"
+skip_extraction="kristall-mime-info.xml"
+
+pre_configure() {
+	vsed -i kristall.pro -e 's;/opt/$${TARGET}/;/usr/;'
+	cp -pv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/kristall-mime-info.xml ${wrksrc}
+}
+
+post_install() {
+	local share=usr/share icons=usr/share/icons
+	vinstall icons/kristall.svg 644 ${icons}/hicolor/scalable/apps net.random-projects.kristall.svg
+	vinstall icons/kristall-16.png 644 ${icons}/hicolor/16x16/apps net.random-projects.kristall.png
+	vinstall icons/kristall-32.png 644 ${icons}/hicolor/32x32/apps net.random-projects.kristall.png
+	vinstall icons/kristall-64.png 644 ${icons}/hicolor/64x64/apps net.random-projects.kristall.png
+	vinstall icons/kristall-128.png 644 ${icons}/hicolor/128x128/apps net.random-projects.kristall.png
+	vinstall ${wrksrc}/Kristall.desktop 644 ${share}/applications
+	vinstall ${wrksrc}/kristall-mime-info.xml 644 ${share}/mime/packages kristall.xml
 
-pre_install() {
-	export INSTALL="install -D"
 }

From 7fda804d2b5fec62f3fcfd4f523eaed627e93a7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Jan 2021 21:18:53 -0500
Subject: [PATCH 361/752] rpi-userland: update to 20210110.

Make rpaths relative to allow proper function inside, e.g., a
multilib root; also, drop unneded dynamic linker configs (which are a
bad idea on musl anyway).
---
 srcpkgs/rpi-userland/INSTALL  |  7 -------
 srcpkgs/rpi-userland/template | 19 ++++---------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/rpi-userland/INSTALL

diff --git a/srcpkgs/rpi-userland/INSTALL b/srcpkgs/rpi-userland/INSTALL
deleted file mode 100644
index b544f54c430..00000000000
--- a/srcpkgs/rpi-userland/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-post)
-	if [ -x sbin/ldconfig ]; then
-		sbin/ldconfig -X || :
-	fi
-	;;
-esac
diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template
index e40f534acb1..b222667e334 100644
--- a/srcpkgs/rpi-userland/template
+++ b/srcpkgs/rpi-userland/template
@@ -1,20 +1,20 @@
 # Template file for 'rpi-userland'
-_githash="06bc6daa02137ca72b7a2104afad81e82a44de17"
+_githash="093b30bbc2fd083d68cc3ee07e6e555c6e592d11"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-userland
-version=20191218
+version=20210110
 revision=1
 wrksrc="userland-${_githash}"
 build_style=cmake
 hostmakedepends="pkg-config"
-configure_args="-DCMAKE_INSTALL_RPATH=/opt/vc/lib"
+configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib"
 short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/raspberrypi/userland"
 distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
-checksum=cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9
+checksum=b23fc0849d282a8ba27b821cb8f63fa2ebc2ae8aa3cba0664ce3809ea814507b
 
 LDFLAGS="-Wl,--no-as-needed"
 archs="armv6l* armv7l* aarch64*"
@@ -55,17 +55,6 @@ post_install() {
 	vlicense LICENCE
 	rm -rf ${DESTDIR}/etc
 	rm -rf ${DESTDIR}/opt/vc/share
-
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			vmkdir etc
-			echo /lib:/usr/local/lib:/usr/lib:/opt/vc/lib > ${DESTDIR}/etc/ld-musl-armhf.path
-			;;
-		*)
-			vmkdir etc/ld.so.conf.d
-			echo /opt/vc/lib > ${DESTDIR}/etc/ld.so.conf.d/rpi-userland.conf
-			;;
-	esac
 }
 
 rpi-userland-devel_package() {

From 6ae54fccc68c6c7c295aa93d1cc02abc48ca0c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 10 Jan 2021 23:43:07 -0300
Subject: [PATCH 362/752] linux-firmware: use included Makefile.

Manually copying the files is error prone, leading to a lot of missing
symlinks (defined in the WHENCE file) as well as unnecessary content,
such as source code and some helper scripts. This commit fixes that.

Fixes #27682
---
 srcpkgs/linux-firmware/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index a2cc5c30c9d..bb1fbf54ecc 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20201218
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,14 @@ subpackages="linux-firmware-amd linux-firmware-broadcom
  linux-firmware-intel linux-firmware-nvidia linux-firmware-network"
 
 do_install() {
-	vmkdir usr/lib/firmware
-	vmkdir usr/share/licenses/${pkgname}
-	vcopy "*" usr/lib/firmware
-	rm -f ${DESTDIR}/usr/lib/firmware/{README*,configure,GPL*}
-	mv ${DESTDIR}/usr/lib/firmware/{LICEN*,WHENCE} \
-		${DESTDIR}/usr/share/licenses/${pkgname}
+	make install FIRMWAREDIR=/usr/lib/firmware DESTDIR=$DESTDIR
+
+	for _l in LICEN* WHENCE
+	do
+		vlicense "$_l"
+	done
+
+	# XXX: should some firmwares, like carl9170, be pruned?
 }
 
 linux-firmware-amd_package() {

From 4d7913477be42d96b4cb67b9338e99521a49bc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 05:00:45 +0100
Subject: [PATCH 363/752] zita-convolver: fix build

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

diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 06664118266..14cd977773a 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -14,6 +14,8 @@ homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
 
+CXXFLAGS="-fPIC -DPIC"
+
 pre_build() {
 	sed -i '/march=native/d' Makefile
 }

From 1793b3b28f6e1929e1543b282f3348bdeb7241e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 8 Jan 2021 21:14:14 +0100
Subject: [PATCH 364/752] pcb: remove old pcb-data dependency

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

diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index c9546e05b02..56b6d6e3a94 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -8,7 +8,7 @@ configure_args="--disable-update-desktop-database --disable-update-mime-database
 hostmakedepends="flex geda gerbv intltool netpbm pkg-config
  desktop-file-utils tar texinfo tk"
 makedepends="gd-devel gtkglext-devel tk-devel"
-depends="pcb-data geda gerbv"
+depends="geda gerbv"
 checkdepends="ImageMagick ghostscript"
 short_desc="Interactive printed circuit board editor"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From 4051abd94bfe4895325d80db5de7e5d9ea806d4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:35 +0100
Subject: [PATCH 365/752] attica: update to 5.78.0

[ci skip]
---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 3917a4e49b0..c88d6236bf7 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=035869dd6ee0f0c66972be31c06030f2bb676bb9b85824bf1c8c1540e6313ebd
+checksum=15f194688ffaa78b5cc093c61c08f7002f7eff042ce202466c67077f13d49676
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From a1a9673169f934e0b03b04403c4fe93049ffa54e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:37 +0100
Subject: [PATCH 366/752] baloo5: update to 5.78.0

[ci skip]
---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 3548e4a6141..da59a8fa293 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.77.0
+version=5.78.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=00cca6a11b48d6e5cf915d56959ed9087fa9264a8bdc771fc5e5aa5a105bc9db
+checksum=f152c9644c812cdaf0dbfb5fb224e64e2fa0dedf615dc1f2fa572abc1e051add
 
 baloo5-devel_package() {
 	short_desc+=" - development"

From 2017af472800c29b5ef8d8dd5fa3ef5bcd74bbe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:40 +0100
Subject: [PATCH 367/752] bluez-qt5: update to 5.78.0

[ci skip]
---
 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 35d50e18fa7..1b31c471808 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.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=fb1d33265cb0beca0192b56b0592065ccdf5651b9d3c76b119f46cd523ec70e3
+checksum=e97b36b02afb97193036ffa615430d4047d76e5a4be4596862be7e44b7d303bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 401bf85ed1fca758986d4822f2726cbe3cb62fd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:43 +0100
Subject: [PATCH 368/752] breeze-icons: update to 5.78.0

[ci skip]
---
 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 615659b34c8..f1dd6f79311 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.77.0
+version=5.78.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=96ad021edd6999e632991bff286f13601b898dc623388e52e82b68b5ac0a0f82
+checksum=425f6d0163dac092939dede0b1023de5b175738cb59bb2ec002c821973a449b9
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From bb4bd7e62a1318f78770872a59f5f50710137b60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:46 +0100
Subject: [PATCH 369/752] extra-cmake-modules: update to 5.78.0

[ci skip]
---
 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 8882a5933bd..b729f394455 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.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=OFF -DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=42f071f628b192122894026de20097cb0b3de411cb41c6935b48eb86ce992a65
+checksum=eede1f0c21f24eca56bd71a805fa76500a8c683bf21982cb33f4bba682d012f9
 python_version=3
 
 post_install() {

From a4e14054f7b4fc5f5fb383ba812bc64d6de42fb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:49 +0100
Subject: [PATCH 370/752] frameworkintegration: update to 5.78.0

[ci skip]
---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index ce9bd962dab..34241fd19cd 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0637592b489ee1187ffa7af2fa8aff4dac184189abb797ee90fecdb5ff5e0ec5
+checksum=908b5977cf711d6b78b5eab30bc9093bb2804a45cd15986d57124d869d407167
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 58d7cffe35760ffe9c154251f43221531c8655a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:52 +0100
Subject: [PATCH 371/752] kactivities5-stats: update to 5.78.0

[ci skip]
---
 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 7820ec6ec29..bc47894a29f 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.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=42c98f90d70efbb4422eea35ccc2a41e5ebc585b5b51e3f5c7d6ae82af8d6925
+checksum=fa303808bdf9dbb268177ae876b1d85d3eebf0ccb7aebaee74b2a067b9e6d629
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From d6e6a9d18ed97f19ee8ff193931a159bebca2760 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:54 +0100
Subject: [PATCH 372/752] kactivities5: update to 5.78.0

[ci skip]
---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 88dca61fc1c..5388b8bf55f 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=971179beb7b214edb9954cfe38b35a62331a7dad5cacd61b41401778c095dca2
+checksum=114eba7e76f3341c20fc7ac3936a8385d3d9d7b985aa1491689d4c6a38cb6787
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 1b66dc28e31cf366dd4d8a0f7fe003f1eb82c1f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:57 +0100
Subject: [PATCH 373/752] kapidox: update to 5.78.0

[ci skip]
---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 5c79ad01667..1bde2d0f977 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca75b2c66a90b9f1a8cbec40db9099cedbaf70db1b5f46947b79acc14375642e
+checksum=774f1b8fafb161c7602ab45774cf6024360d9cc840d99adc436feb6cc75011b5
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 4b17175e0f5aba20b3d8dab392b6d638ecbc07a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:46:59 +0100
Subject: [PATCH 374/752] karchive: update to 5.78.0

[ci skip]
---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 2cd010dd141..48ad79665b0 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2239af811b9205d9f4486791f4b25ff5ea299b3873021a646e1c8b9d44c2be36
+checksum=82e7a24280132b1654dc36caba52676b988a9feeaa6dbb9d398b170608f012d3
 
 karchive-devel_package() {
 	short_desc+=" - development"

From ab60f7959082a744b1ed681d28b1162087d27aec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:02 +0100
Subject: [PATCH 375/752] kauth: update to 5.78.0

[ci skip]
---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 88b124841dd..e7295401182 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5a54ec41b1be0a72d710c43b8e00a7e3ac5e982c73da8ae48edf16cbc7c8c1e
+checksum=efb3b050492f466c4c531217c39aed67524976884a00f395eaeca147caf61db0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 70e815ebaa352965348a5661ebad69964200d18f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:04 +0100
Subject: [PATCH 376/752] kbookmarks: update to 5.78.0

[ci skip]
---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index fc01daf09bc..d90e2f423b9 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20d1afd298227f4d45685a17816d7a41ef97e97a99ef816a7939226f92327923
+checksum=8301b0857e253bd12ffdbcde2866f91c4dcfe438bccd51b8bbbc61efa703ef2c
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 2b3c2dc2d6bdb947796e257b15fce04503ffae58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:08 +0100
Subject: [PATCH 377/752] kcalendarcore: update to 5.78.0

[ci skip]
---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index c804ea900c9..06d55c421ae 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.77.0
+version=5.78.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=6d529aab66431daa84d506619a31287b1c628b1bdff919db4e010214675730c7
+checksum=3090887fe9ea28c062530aed6f0148ad34ab610c2efea7dc6e75258715d727ed
 replaces="kcalcore>=0"
 
 do_check() {

From 28dbcc2ac9d1869e881eaef80f6c9d50f6612a3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:10 +0100
Subject: [PATCH 378/752] kcmutils: update to 5.78.0

[ci skip]
---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 4916407b275..4041f487496 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85bc905e156a56042572403dfcf53a653bdee3c87c9c367042048f4761f1e684
+checksum=68165fa953286ba5034b1766d09b02542c9d3eaa13dc4d64e8ced84cc70cc2d3
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 8f74a8c97a79b932be2c478d0daac39b0bb4a951 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:13 +0100
Subject: [PATCH 379/752] kcodecs: update to 5.78.0

[ci skip]
---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index bd9d80238ea..464b57b0857 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1b34aac21f6ab21e91e0e11f620949574678146f4407c853516c0f456e81fc4
+checksum=36b461cef0bb95c34298615a8a6d1f2da37676c9605ebae76d6cbdb393e8fc7a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 91acb3239f2a3761410c7d1c0a65ac2d3ae64d05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:15 +0100
Subject: [PATCH 380/752] kcompletion: update to 5.78.0

[ci skip]
---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 92c4d6c5da0..f3b0bdd0fa0 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2ed7c90a575de468fd025688e7aa566b30003f4e43b1d7ed0c5dacafa0abf3d4
+checksum=a73972651b5230c8df2d5d7b463d48004b8fd6672bda164e834eec5345113fa9
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From e18a2f61c59f8eab431419b5f1822a8f88d02654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:18 +0100
Subject: [PATCH 381/752] kconfig: update to 5.78.0

[ci skip]
---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index e4d1bf76a20..1739c93da94 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=30e81a7d00cc862e9d07d0e6d0fa55b561641850b7aaffcf51d4b390f1eff981
+checksum=b27a1e97d520e98178f955b8ab29e794df7733beab1898ef06ab5f14afcfffbb
 
 kconfig-devel_package() {
 	short_desc+=" - development"

From ce75936b8fa2c0617a1c1b280560e2ba4ac709ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:21 +0100
Subject: [PATCH 382/752] kconfigwidgets: update to 5.78.0

[ci skip]
---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index d21d5816a1d..6b53696034a 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f4a6897ef58992d38e820e8b0112069aec2ef0e7b943eb14265482c4fb22cd1
+checksum=87d4cd10145d5bf0e07f1913682553e368db0ee4a900d18368517ad9fda2ec39
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From ce126a368eb91576a155c368f5e811d6e5356a47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:24 +0100
Subject: [PATCH 383/752] kcontacts: update to 5.78.0

[ci skip]
---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 470d3b64a89..e12465ca831 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.77.0
+version=5.78.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=15200917e7c07fed424de0616ba6e6a31355286e0d3022409f1bb448cd62aaeb
+checksum=9c3d12aa4675f7677e8c87725b23ae65bb258fd230f9ed9eac38b5d8100555f6
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 60f2934d61c4a61279f8f20cf2a9c60150eb8f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:26 +0100
Subject: [PATCH 384/752] kcoreaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index bcfa13266c5..eca6b669012 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=238e4cc422a62a2c3cb12915dbb52ad1a04be2ed13f59bfe3d1959266f08471d
+checksum=635ff94d5d15e0f7603901dbeeecc20ef633fd4f558d20462e7aacb1a88c3b07
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From fa0a96d4bc4b348a91efc88ae02d1625265be848 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:29 +0100
Subject: [PATCH 385/752] kcrash: update to 5.78.0

[ci skip]
---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 82e6f445b3b..9cd655b3018 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bda5567aca769590fbdd96d82d64ef6200350e3c88029d26c7a3603ce880a84e
+checksum=724a224efce588b9295b3ea01ea879d3eeefe77c843d833858718ec8bbfc3d67
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 1c2b41dc7c914503e1ec50345fe673b21f2a8afb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:31 +0100
Subject: [PATCH 386/752] kdav: update to 5.78.0

[ci skip]
---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 8dae675f8b3..b0e82be82b8 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.77.0
+version=5.78.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=8ec9230d4d6ce15ed4f146e4b22846185c0d3046ada8cf98bbdae9b913dd0da3
+checksum=1200ac36df6cbf1f6a307166b50f3091762b8e5beb5e9a5925c4f89ccb2f10c7
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 74499e55edb80df76fd7a7903d7b2799968d8323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:33 +0100
Subject: [PATCH 387/752] kdbusaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 414d26d0955..258bb9f2154 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9c11ebd460ecc198d65b1c3e00dfd4121b6b2ac63dadb14189fee1f605d78bc
+checksum=4f91d0b5762243e5e044c087d4faaa584ad5f779fdede138a0048fd4af24d399
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"

From 102ff745f8254000e576ebeefeea9f14a7552563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:36 +0100
Subject: [PATCH 388/752] kdeclarative: update to 5.78.0

[ci skip]
---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 17a0e9caf4f..631a02c98f8 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2eaf59a4f73e7578c7b381078ca5ae920a3e8763433932277650707432104cb2
+checksum=4759319fd1569d64f53d299f67c8564e75f687376f2774dadc7c53e45d2f4797
 
 kdeclarative-devel_package() {
 	short_desc+=" - development"

From 960c4176bbd51edc6f220e5b61d7d236307ddbad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:38 +0100
Subject: [PATCH 389/752] kded: update to 5.78.0

[ci skip]
---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index e2eea637abb..d83cc3640a4 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=921308b8690ceffcb56abf9503da6c32a824ef0540d15ff619c23ff250fb295e
+checksum=35156cac1df945e7420351b8a361567f20f21af78fef053fa51d8a0ebac2bd52
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 77fbf7756587361b1dd02f179eec91fa5560f044 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:43 +0100
Subject: [PATCH 390/752] kdelibs4support: update to 5.78.0

[ci skip]
---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 48035755848..7fec2a834f6 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d62ebe8aaa63218b293bc77b68aa9e6394ca314d525f8b170692a9465a436f7c
+checksum=98f914a9f2ad778c3f5dad4f340cb930a13fda968c899aef3812403d20fb94c5
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From 8e5ded7bae9235f34de133685e64039dd2dd2281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:46 +0100
Subject: [PATCH 391/752] kdesignerplugin: update to 5.78.0

[ci skip]
---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 5f2182d1275..b87caec9973 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=463fd7997e9177ca5f9b7a6533f8331960e51c6c8b7e88636e12267cd174b823
+checksum=9ff333f7d0432219b654bc4bb31cc3b152961dbc91454bdea7d522d6d11b0fb2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 866814fc46a8b18991b8abd0b566ebcdc80a9b90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:48 +0100
Subject: [PATCH 392/752] kdesu: update to 5.78.0

[ci skip]
---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index e00959cc794..f5f0770b6fd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bca5d64ab4d3f446c8c42f091b1982a83e80d4b810e0c00b1ae135a9751c632f
+checksum=d5f942ebfa602acf61a46f45474ec2f5403a15111906641f3108de0e8db44b1c
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 30344ed32e35a63eeb5f6def3031a5101b52b423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:51 +0100
Subject: [PATCH 393/752] kdewebkit: update to 5.78.0

[ci skip]
---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index c91044d6028..ab31b7cbdef 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=91d8cf476f09620424a8e6d4940c2ceaad5d1fbab7cd36b0b14a2451c52067ff
+checksum=61e17a2616cf93469852ea10c5bb6e2a6bc50c944dcfeb65834f9ca109a39655
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From b55d1caddaac44118d3e5bd3068774eb6a4722d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:53 +0100
Subject: [PATCH 394/752] kdnssd: update to 5.78.0

[ci skip]
---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index c90b88101fd..9396fff3262 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a94cce0d9e5557f83bc76ba6055a77867786c87c6ce723c8a66b6f3a3ecfd56
+checksum=4e03bd3dfcd468ef2d75182488b779006b59a5cb6c7f44fb093116d04b5c52e7
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From be733f6f553760f4ab3c903c4b6d4e25c82df52c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:56 +0100
Subject: [PATCH 395/752] kdoctools: update to 5.78.0

[ci skip]
---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index a194bf36891..7f5d909ec9d 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a78c44534f85824ed8168670d2880d3735083129635109dfe54fc21f16fb6d44
+checksum=7a08eef3d7c0e4eac7d46ddc0d25942e008907bcac10ed27bca02a1169e2cf62
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"

From 9344a67df5a230a01b6a23b2352b515418457616 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:47:59 +0100
Subject: [PATCH 396/752] kemoticons: update to 5.78.0

[ci skip]
---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index cf7ba9f624b..d21b438efc5 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0c87364ca0b7b0d409d4083ef8d086f0e67d5bc30ee8f5c8df722bc12e68a8b4
+checksum=753c5c315a93174f3ce24bd8318bc7c1c0db813fba1e19ea6563be58ac805491
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 183dc170cd53bf5bafd1d0749daf18403ddb0421 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:02 +0100
Subject: [PATCH 397/752] kfilemetadata5: update to 5.78.0

[ci skip]
---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 6160954e3d7..8eebfe4957f 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=b011984183b45ac1f62cfae0bd59e3d91793e26b30998148dcfa9db110267491
+checksum=9dd965188f38dfc5cdcefb3b73d41885b069acb95076b96140b64e72dc213c84
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From bda566ca841bee1158335b999b73f6ad3e594752 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:04 +0100
Subject: [PATCH 398/752] kglobalaccel: update to 5.78.0

[ci skip]
---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index da2c99e0f24..2f27b0c819e 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b47d95a5a28f64f10b2c9c0b0befde64cdb609bb3d88276ecedf7b3ddfc1457
+checksum=3f196edde20388b2c1b1aa0139de7701e86d1faa85578827e89f96f56293b822
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From e30344432ed9d9d28181f479f9c6d7e433395f28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:07 +0100
Subject: [PATCH 399/752] kguiaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 2768a10de72..527d26ae5ad 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.77.0
+version=5.78.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=df674a64142d494345daed77cb64ab5b27960ebeda94ae30287bf311acaef63c
+checksum=ad09ed2db12a8740c5bc2d0b1e45b4a4f5c05835b995d2aa5492c11561bc77d0
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From fef51facc7cd94946106a35b4d2092c72c0bbbfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:09 +0100
Subject: [PATCH 400/752] kholidays: update to 5.78.0

[ci skip]
---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 17d791b3d00..631edaba26d 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.77.0
+version=5.78.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=076862b69b38d9f8bde71f2f3b083da113a38ea419143c20f5186a1065b70552
+checksum=2768b85bad18603eacb93d211ebba51db800e532a2c0ec9f70cdaf5c0d50f590
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From f6d87648a8fd0ca2f743498b10ce5b110962ccf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:13 +0100
Subject: [PATCH 401/752] khtml: update to 5.78.0

[ci skip]
---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 76efabb2920..044bb1f3abc 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.77.0
+version=5.78.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=36d648c3e50fbc43ee0fcd565e67e531e8029d6f0346c09cb0cb3d693825576e
+checksum=16b63351a779bb877263c86fcc3600f8385dbfb7218593560fe022ba1830515d
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From cf555cc2fefef84ee3321b083a934fc4b4b16115 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:15 +0100
Subject: [PATCH 402/752] ki18n: update to 5.78.0

[ci skip]
---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index b064e47974b..d1acafc03f4 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2e1b74dedc1a3af88f04c470922d1fafb892d5846ea91ad139d421070cff357
+checksum=13352d2ce158c09edde129712adc12ca50c81bbcafe2df924192b5faf2dc4e55
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 2ed8cce35e2611d6a469a3a90df61a6ced40ffad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:18 +0100
Subject: [PATCH 403/752] kiconthemes: update to 5.78.0

[ci skip]
---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 82f1ad405e8..8b3823410f1 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=735834671bd32f26da075d25f4209faac04fcc6af2f4090f99d055a3a277dc79
+checksum=fb887e4d93cdd240545c8c16431cafafe3ec3c696589540d79a0e28b92084d6b
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 7042b8c989ec7975bf9e6ae5afad68be714f8057 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:20 +0100
Subject: [PATCH 404/752] kidletime: update to 5.78.0

[ci skip]
---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 302f4393ec2..a98fb33d610 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84e482e6c3af7fbb534547a87f49084cae1b9a4b6a7f3f26478f2c517d1b937e
+checksum=aa96864a2ea370a08ef3b6c720d2716b03d18213973b21e617e3d635ae79862b
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 634e9775fb54559f2ffa6e4ba3ec0bdf5bf28113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:23 +0100
Subject: [PATCH 405/752] kimageformats: update to 5.78.0

[ci skip]
---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 5160050984d..899a5a65753 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04bb3d02a8d967869c102da04d0c8c9e651c8e54625eb5b126156fefcb1901b0
+checksum=ecd4cf4ec006998b73724776cb2cb11f636057bd5f29ae134451fec612e1623f

From afe7f64bf2bbb197463ea5fcdf07025b097a0368 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:26 +0100
Subject: [PATCH 406/752] kinit: update to 5.78.0

[ci skip]
---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index ed82c697492..4e8af1ec942 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58cbed51f7566b379726f46b18174f0dd9397bec77adc9face7263475110d56c
+checksum=7b93fd213ca6b0787a18033f97255acf159d65bdf8e5f90a706a036c6aa5509b
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 33b014ccd494e7c85b83398d6417d365ba484532 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:30 +0100
Subject: [PATCH 407/752] kio: update to 5.78.0

[ci skip]
---
 srcpkgs/kio/patches/fix-crash.patch | 29 -----------------------------
 srcpkgs/kio/template                |  6 +++---
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/kio/patches/fix-crash.patch

diff --git a/srcpkgs/kio/patches/fix-crash.patch b/srcpkgs/kio/patches/fix-crash.patch
deleted file mode 100644
index 163a0428c19..00000000000
--- a/srcpkgs/kio/patches/fix-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Tue, 22 Dec 2020 22:23:17 +0100
-Subject: [PATCH] RenameDialog: Add missing nullptr initialization
-
-It fixes a crash when pressing `Apply to All` in those cases where
-the action was not present, as the code checks for nullptr
-
-BUG: 430374
-FIXED-IN: 5.78
----
- src/widgets/renamedialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
-index ac1d91d2..c3e04753 100644
---- src/widgets/renamedialog.cpp
-+++ src/widgets/renamedialog.cpp
-@@ -161,6 +161,7 @@ public:
-         bCancel = nullptr;
-         bRename = bSkip = nullptr;
-         bOverwrite = nullptr;
-+        bOverwriteWhenOlder = nullptr;
-         bResume = bSuggestNewName = nullptr;
-         bApplyAll = nullptr;
-         m_pLineEdit = nullptr;
--- 
-GitLab
-
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 6cde3c9b403..7fd6937356c 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,7 +1,7 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.77.0
-revision=2
+version=5.78.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=237c85c9dbcfcd366290512005b0e8498c10f3b300524633bbc9319a8327a14f
+checksum=e211dba2c1ed73b67188d3ddbaf40043409912ab731aed4eba5bea32a587d620
 
 CXXFLAGS+=" -fpermissive"
 

From 44508273ad20d247587275f142a08a95c2dd960a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:33 +0100
Subject: [PATCH 408/752] kirigami2: update to 5.78.0

[ci skip]
---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 64246d4e2ef..cba20a77545 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.77.0
+version=5.78.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=aa4941f63e903ffdb029621739595c67acf02f16a2bca3657693c1fd5e503d96
+checksum=5e4e2be2a03d4ff4aae99c9451c2fc81015f9e5c22cc679e188346e83be3c718
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 4b41a4d1f0a741c4c1ec1d1dfb09562054f3ea66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:35 +0100
Subject: [PATCH 409/752] kitemmodels: update to 5.78.0

[ci skip]
---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index a4e9cb5429e..f79918ab8c1 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=decc3f607a0b2e9e6d585188eb6664a2cf06646db50d4d60dce83d96a0456534
+checksum=4a361cf0fd7bc48261fddcc5b916367cb22b5a2cfdbb91a6eff5d0da4e7cc8fa
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 4389661c25680d913b5311e15a2ba0d1f1c69eac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:39 +0100
Subject: [PATCH 410/752] kitemviews: update to 5.78.0

[ci skip]
---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index d601771d923..10b66b1ede4 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1013c09c47b87c51b21e6cfe5a6ed112ba43ab9b18b8d41fe7ffe2214faf1b23
+checksum=05f8895880afd15b2c08570df26cfc6cec847808e1aab0968ffeaf47618eda83
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 3a97dc978d6da9218fb47911180a0cb811b53e6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:42 +0100
Subject: [PATCH 411/752] kjobwidgets: update to 5.78.0

[ci skip]
---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index e1cc8ad78ae..b6d0ab12ae3 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=113fbf6c9e87e8eef727c3578a02845f99256e8ceca2d24640118ceafc7fed2e
+checksum=9bc3ba73f7a55896dc772adac8042e3cd62d795e5f066593eb08644e023fbe31
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 90d66005157c33ab570ae072dd05b48e89c6d835 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:45 +0100
Subject: [PATCH 412/752] kjs: update to 5.78.0

[ci skip]
---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index f77d9d56cbb..6959d0410a7 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=e8a776f1dae92bfe3c0cf0b60f1556b78ad20eb12f9ef149f1a484e7d29aafca
+checksum=9070e1d8b28ea111f1946de57fd80c74dd03e92e31fa3106c4fbb5d38de4566a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 461dd5b8828a99f689e60fb30e1c1e578f03436c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:47 +0100
Subject: [PATCH 413/752] kjsembed: update to 5.78.0

[ci skip]
---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 28d0b0c3dc4..349f76ac965 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fc7efebc3d7b40066e215ca61cc8e15e0d1e389706277c5f6b972b96020cf229
+checksum=296faa38f8996e8b99a7e83fb67d4b0dda5a4284a77aaec9d41ccc62f1ea1065
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From ac617d7e26e6a9455fb4e5e652bc346aa862c5ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:49 +0100
Subject: [PATCH 414/752] kmediaplayer: update to 5.78.0

[ci skip]
---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index f93ac09dca9..50856c9bd72 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=cd2c6a33aac3a8fd65e597d7287147f5e1a60cbb8318764a3776ca29b3314bbc
+checksum=9afa27eafc8c7d144134d6ddc6e3cbc6310d6324f81d2ca6bd4142f69898c07b
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From b0c28f4d98a23d92dc236aea61c7a60deb9ae93b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:52 +0100
Subject: [PATCH 415/752] knewstuff: update to 5.78.0

[ci skip]
---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 7d3773c631f..9715df32071 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d031fe85c8870d1fd99d7a0252f06169d078be803bd6a70338403b624c7b70bc
+checksum=d5b0abd5d4ff67e1f4fb921b710d1251569bfc2e19788d9ce7843b498f9a61b9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 925d47e9d753524f9673816dc2221f99d3280d9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:55 +0100
Subject: [PATCH 416/752] knotifications: update to 5.78.0

[ci skip]
---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index b188dd47d30..491a5986b0d 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f288fe163a9297011af9f2d147e6516f07c1ed68ff0546cc0cf65e858bb40265
+checksum=397fc21bbbaf235fd092f3bde731d2c0f1736ed4595e4a4cfa4b1e4328ee2339
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From d4d5649c57b321dc5408beb15f35821c6fdf7f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:57 +0100
Subject: [PATCH 417/752] knotifyconfig: update to 5.78.0

[ci skip]
---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 917f1d80e53..477043de044 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=29ba27263e4b33990685cced7bb2d8288cd3370adda1e1df7335e1cd9d1d5d99
+checksum=df01a3c61502d60d16adcdc1c7b75de4b05e0850243c86dbd8fd1012a339fa5b
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From a8c50d1ad928c8144152f55ffdb4f7e068dd9111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:48:59 +0100
Subject: [PATCH 418/752] kpackage: update to 5.78.0

[ci skip]
---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index daef0c6488f..4d5966710bb 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e91f8dd81f4d2f5730ec444eb8acbe7e1891fa31df2fe01886ae0012d9ec2bd3
+checksum=ec906a1037b91d747a858b77e40e24c279c1af72199cc15dec422a1707741b34
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From ad62148f6a7e090ec6a1583795a11736e2418bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:02 +0100
Subject: [PATCH 419/752] kparts: update to 5.78.0

[ci skip]
---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index ed12b5f6b1c..b5656880144 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.77.0
+version=5.78.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=3afdf8472d0e1aa991f4395d08bcc6836512c1da0fef9634087bca695df4e77d
+checksum=77d33ade190828254d1e0c8855b873282168eaf6a4f8ff42c902c2f8a1dee1da
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4072974288cb16c29307b07f73ad5545a1125f13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:04 +0100
Subject: [PATCH 420/752] kpeople: update to 5.78.0

[ci skip]
---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 8137cdfb218..8b15279901a 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7f40eea87062d585fe70504e5e83d81df3fd71f63ea8bf3b04dd35419348f26
+checksum=b180d9623f9ed0c83deb49a299bad6f7b88b50a2f83ea745d0c970e830088c31
 
 kpeople-devel_package() {
 	short_desc+=" - development"

From 9fa192817225548e9c2f0b6455a14c3ba748ada5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:06 +0100
Subject: [PATCH 421/752] kplotting: update to 5.78.0

[ci skip]
---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index e8091bf60cf..54f2138ca46 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32226573989c105d84a324174d31a1ed4c7cbf57a75341873cd8fe5692d7a2e8
+checksum=6cb34efc35645ee26801587f65d7f4ba452dd219c1fcb6dcb31a30725f1e8d03
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 8a7252de2b371b90984e828751942676297ea480 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:08 +0100
Subject: [PATCH 422/752] kpty: update to 5.78.0

[ci skip]
---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index d0bdae8c28c..ded45618041 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=904bf61cda153f092fc5e2d089a00d73152c2dca6f7a0035f3978d9a7322f1e1
+checksum=c3d1d6d431de7608f9e764ab40c4e1f0c1765d0f6f44c092c4d62e942e9511da
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 8daeb2081742cfaf490099ad1b353f85ef3a5daa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:11 +0100
Subject: [PATCH 423/752] kquickcharts: update to 5.78.0

[ci skip]
---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 4ebb6f6f19e..4f75e6a4984 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,7 +10,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=267b7d53a49f9e15d2d3e144f1d352ccc5eacb00286539294e0e8537206fd59b
+checksum=1762b927e8fbaa24cb20425dfcdf875190000f357d1f3637dd580bc2c75d05ff
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From f3b195f3d59ae4c227935ee50bcd34f12e75bbf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:13 +0100
Subject: [PATCH 424/752] kross: update to 5.78.0

[ci skip]
---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ecdacd7cb57..6f6029cc66d 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7e48494f1383f91b2bf448692db2f3bafc123275daaf4a5b37d7dfd141380d31
+checksum=6121ce648605b8de960889a6c48a5fda967b3f52e38c626c5ac6f5f2e766d41f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 5a8b01297fcf9b1029d0ada77c58977835855f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:15 +0100
Subject: [PATCH 425/752] krunner: update to 5.78.0

[ci skip]
---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 3d982193e18..98e8a4ab4a3 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5381bf1d4eb68eb448d2e5b92e4e86edb2727acdea44c31ffc499862417ed5b4
+checksum=755e627292550d56ae77e356eb7bd5991652c196d8499af6fb6da7989e301e02
 
 krunner-devel_package() {
 	short_desc+=" - development"

From c44100d12347aaeadaadbf0ec101633146c27280 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:18 +0100
Subject: [PATCH 426/752] kservice: update to 5.78.0

[ci skip]
---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 0168042614b..e5804330c91 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=942f50329be3a6dc727fe7c01dc8e61aede65c4050798388e6bedb60c21ab8aa
+checksum=2ce68ad220b2bc6975f84d8f231afe1a1b5cf6922a75e0ce9541c61e3c5535a0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From faf9431332e6e5e4da70ea2197f94c270f3da190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:21 +0100
Subject: [PATCH 427/752] ksolid: update to 5.78.0

[ci skip]
---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index b750b882a54..c3f9a84aa17 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=67d066bcaadffa98960346639e8adacf7a3253fdc10d085d32b9c43fba59d921
+checksum=129710956e0f9940b00a0b6b9dca86709f3b753ab88debbf93d7ebaeb44bfde1
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 0f9690516ca4e885cc8f64634d939603d412e1bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:24 +0100
Subject: [PATCH 428/752] ktexteditor: update to 5.78.0

[ci skip]
---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 5e55e649491..b0b9b2450aa 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccc5ea0c2bcbef3babbef727fc604361b1f7ddcf68829353846f315576e84033
+checksum=5664c5eb12fc1282f751be6874ac2b99fb59056ddd6562b7e05e8e6e874524e4
 
 ktexteditor-devel_package() {
 	short_desc+=" - development"

From 83a691dcc301e4d8612dc5171da2acbea0dcad60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:26 +0100
Subject: [PATCH 429/752] ktextwidgets: update to 5.78.0

[ci skip]
---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index df8a4b0c687..18999dc8ae5 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8371accab994192f1505b3bb4805badd751fabd4e8a8ca66cadbc039a253f0f2
+checksum=e8133b3f5ba809c48a92895ecb4b4a1c4beb11ddb589fe6691b6545ce9eef8be
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 1dd36bdc3d59bfb31088180c9c92bb545475c028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:29 +0100
Subject: [PATCH 430/752] kunitconversion: update to 5.78.0

[ci skip]
---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index ea6f6363d1c..a712cec56d3 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.77.0
+version=5.78.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=0c2e206a3ee7c13944cf4d293f71a27944df8bd9d7acf14ca7ff946e225ed2d5
+checksum=8c790c9870362032556e3c7d6b37c01bfb571eef32d33a4ac3c96260d8a5439d
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 4b7fae2912331ea5ca91da087b6a36d6980b2981 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:31 +0100
Subject: [PATCH 431/752] kwallet: update to 5.78.0

[ci skip]
---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index b49aee67df1..771ed6aab40 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.77.0
+version=5.78.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=e33272fedd9d8b1c008e35e2bae3963355e4f8b5ddfab8d6d06c63ddbddad8a0
+checksum=9730997f28ca4e55b015a5d76adcb1200d3e26ec21af9f1a598ce3e4532b16a9
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 5a2fa5ad06855ac003089cdcbf05a8a61fdbf9da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:34 +0100
Subject: [PATCH 432/752] kwayland: update to 5.78.0

[ci skip]
---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 3103df4fb84..df3e56a49d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.77.0
+version=5.78.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=a88f2e98c74ed5c3d4c9c54b6321d79deaa72c339bfad96ad74e5442029d7b0a
+checksum=ab6ba414a69b2399ae7b83844d9ea735cd763afc2e5c2a74292b5ae914db4a14
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 29cbf52777e79cabf3bcdfc926a8c0b8e462e51b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:37 +0100
Subject: [PATCH 433/752] kwidgetsaddons: update to 5.78.0

[ci skip]
---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index c427f1bc382..22f678d7fa7 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c72094fdad6740280513ff27477003839f20555071817337d3bf5c95761d7ae4
+checksum=e4abb00c3228459768e99451350d94255a386ccd9cd15005ffe47f31694c5e2c
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"

From 20e814f50d8bd3d0d7b167ffcf0e6a52a47233f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:40 +0100
Subject: [PATCH 434/752] kwindowsystem: update to 5.78.0

[ci skip]
---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index a3ef2f63950..df9aa90a19f 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=064d31310a8568fb1900c19b955176e245d96f0b42061c15c20bc2e2a7ab4f82
+checksum=6cb9caeceddaaa35754bb41051e1104f60bc205cf89b434fbdd88415edf57200
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From ac54291f0a5b92678111ebdae0201d8ab6f21247 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:42 +0100
Subject: [PATCH 435/752] kxmlgui: update to 5.78.0

[ci skip]
---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 26e607b73e4..b0a290687ee 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae6df2146464ea403d33e8b0e4b69579428bf76c1e13f5fffb8634a65da930f1
+checksum=f80cb68986675a70a36ae711296973c9f88142779c4b402aa156a1bd577fdd17
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"

From 52ee66360829aebce069290d61cb0f3df27e2778 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:44 +0100
Subject: [PATCH 436/752] kxmlrpcclient: update to 5.78.0

[ci skip]
---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index f887a372b76..51ba6abfa3e 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=c90d1add0252915f1c94c4f22360f73b779a8c5c30e04a8155f103317e841f89
+checksum=5d7c24fb3593f1eb43aefd74793738305025677ccbfcd38ecbd071a987602115
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From d4e5f5746704bb600e95021f3e061d45d20b4596 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:47 +0100
Subject: [PATCH 437/752] modemmanager-qt5: update to 5.78.0

[ci skip]
---
 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 b5f3b913755..4335491c4b3 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.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=259d860b5f914802e26cd0354afc3da32fa0a631735b463a4445e70777b40ca7
+checksum=d9db3adb4f6e4103bbf2d584a6286c3995169090c072a6e8adeeb7b395bcc327
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From f4d48a2ae1500deb89315872d5f5d86b704b55cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:49:49 +0100
Subject: [PATCH 438/752] networkmanager-qt5: update to 5.78.0

[ci skip]
---
 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 89d83004a6f..064ebbd8074 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.77.0
+version=5.78.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=9f8e4937565e4bc9e29aa316aef5e1a4efcc53860c313f12eb24dab54194d3dd
+checksum=caf3d4ee4056af726467282bbbbb610e121f4288976adf3c174ba338e967de71
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"

From 9704a9a0aa1b2d491b621d62a57770bb9cb9dc4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:46 +0100
Subject: [PATCH 439/752] oxygen-icons5: update to 5.78.0

[ci skip]
---
 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 3d3f1b7585d..bbe99bcc584 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.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3caf812346adc7c5b91769fc77a6b4e91ccf764c755b84146a88f2fc46be538e
+checksum=29cf52784263001acb4942d77107963aa354d5e98538563e60ae679dcafbe3f6
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 91d920d1eccffa093488f3af78dd05fdd608f2dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:50 +0100
Subject: [PATCH 440/752] plasma-framework: update to 5.78.0

[ci skip]
---
 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 ff647632786..d9dc41f0822 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.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=11678e5274d10a4ca3730a2441c8b555eb527d2a66606bd35fa1f15f667ae985
+checksum=46aee1e872728af5ec5c28c604494bbcdf01c32c19f9fe2593b749bbeb698481
 
 plasma-framework-devel_package() {
 	short_desc+=" - development"

From 1086c0220f0668d73706dd52ad9858f504f44d5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:53 +0100
Subject: [PATCH 441/752] prison: update to 5.78.0

[ci skip]
---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 60685ce30a5..4e5efa0557c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=d2dd8566de361ff469ba0f03eb3a21ac9ffae13781f866d34e5ce7e44ef19c65
+checksum=d351df1579331eadea6fe1f47fde8c7e11765746831947e993879edc996cfa79
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 18f5df42967ae0cc476d5437932afc2e3398fb7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:55 +0100
Subject: [PATCH 442/752] purpose: update to 5.78.0

[ci skip]
---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index e27bc687f60..1a787bcc6b2 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc48dbaa200336dafb5519ff63adf01c6bd22737a8c8423103e9c2d305f0f674
+checksum=498017bdbd1f46773963d2b97bfb8b7d9e480fa6d958a83ce629c7d327e1628f
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 8947c75c71cf31c978495f64aebf99766e0f86d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:50:57 +0100
Subject: [PATCH 443/752] qqc2-desktop-style: update to 5.78.0

[ci skip]
---
 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 032edd80d8f..be00cfc41bb 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.77.0
+version=5.78.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=bb9736691e19ec72138035f46cb7e1d760b07ee9f8946c421c3b611c3ffe028d
+checksum=33ea60eba2112036b6e3e136161746afe84d44227da7b6d3011b83beb3eb3329
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f6b1b9b5858449472ef44ff9e7064688d33aca0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:00 +0100
Subject: [PATCH 444/752] sonnet: update to 5.78.0

[ci skip]
---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 416fe615102..17a7d8077bc 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d092461a6a86811ab749459cc2079903616d4f839e73762b60019b5454db9068
+checksum=c2e70e96c66efa359b47c66937403089b11f6f9bf5406cb24f023809e70280cb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From 931c6147facf160d8a5056da8e1101ccb752603e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:03 +0100
Subject: [PATCH 445/752] syndication: update to 5.78.0

[ci skip]
---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 42b2e6a394c..71c56e6dc8e 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.77.0
+version=5.78.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=e3eaacfe43e07b8d25a188cfbe31c59ad57b2f942871b33d924f800abe91d6f8
+checksum=a12db60298fb8914d59ef286618a3c1fc351d6544f747024f665cddc5320c26b
 
 syndication-devel_package() {
 	short_desc+=" - development"

From d3f31f003e7209a25bb08967b0c274e46803c521 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:06 +0100
Subject: [PATCH 446/752] syntax-highlighting: update to 5.78.0

[ci skip]
---
 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 cfce24fa998..b33ca6bdf47 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.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36898baf86dce80ff125a6b2ae33afee497a61e06711aaa7ef7e0bec390bb6a4
+checksum=8b5eb71ce548bb2267235db42d026d8655285396cfc2766e0277c8688d7bd6d4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"

From 58dbf231b011c43429bba01dc5c56696bb4c893f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:09 +0100
Subject: [PATCH 447/752] threadweaver: update to 5.78.0

[ci skip]
---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ec5b1bc565e..c30b0eee929 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.77.0
+version=5.78.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f898107074943f103fd9d4ee2b82cddcb705382424bd47fcca21b11c167d8f2
+checksum=d972e78e5ce89004d52c08e689b539877f20c036a1ef0383d2be02bc6e7598d2
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 4558734931076858e87adf86b539cc8327b99c39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:40 +0100
Subject: [PATCH 448/752] kde5-baseapps: update to 20.12.1

[ci skip]
---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 3169b6279bb..5019a791eba 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=meta
 depends="

From 0099fec5e7513ee98c5bd90b5e8539be0fb3d811 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:47 +0100
Subject: [PATCH 449/752] dolphin: update to 20.12.1

[ci skip]
---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index de01f5fa23d..ed971ca3c97 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=02b384e85b00aaaf1b4efd7ee7ca9d2f98991b850aa3645b7161219e9087ccd3
+checksum=b71652f40f28d92e790a0cdffbd0124c09a7a2264a7a798297b9238171454f58
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 9dbcccd10506e454be053b357591d110909dee87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:49 +0100
Subject: [PATCH 450/752] dolphin-plugins: update to 20.12.1

[ci skip]
---
 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 6dfab5a8961..ef6802940c3 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=20.12.0
+version=20.12.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=1f1124f89540e19f6d17723fc6d779428736acc2cfcb82c38b547141eca5942f
+checksum=926dc9f69b1a22553f8808b14634ab3760170bddaa4de44e03a763c3074bc74e

From f754f29a95e5832708413e4e8aba954325b018ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:51:56 +0100
Subject: [PATCH 451/752] khelpcenter: update to 20.12.1

[ci skip]
---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 9124dfebc1a..4d4fa5aa9f9 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=20.12.0
+version=20.12.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=8544416929518a3744b933c88a13f4f878fd6fab915866069557862f663c855a
+checksum=66e137a74bf79bc9af4320c7803c0e03d834f79b0e567295ece8bc81a3466ab1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From a5c4730b7ee60a04b6804bdcedb810f00ab31c59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:52:03 +0100
Subject: [PATCH 452/752] kate5: update to 20.12.1

[ci skip]
---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 94d8ef2f0a3..7cc920beb9e 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=20.12.0
+version=20.12.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=69017d7369bbcac7a3e350fc0e02cbcfbf5ce09e89149e765a1cd647f3cb3c0f
+checksum=739bbb0378b73245465b59ae961e325d3224e251ae8b97d30c2daceec622a28e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 51854497f965155f96e9b7ad39ca2239d61df361 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:52:06 +0100
Subject: [PATCH 453/752] konsole: update to 20.12.1

[ci skip]
---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index ea51cda9b05..900cff279dd 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=20.12.0
+version=20.12.1
 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.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=6d3ba8a4e5baeda3f8b380f122313de1421836892994f1ddf0e6872696598d59
+checksum=b690be392462cab5abac74d1e1010c3f991c3d00968b51ed5525040640d769ec
 replaces="konsole5>=0"
 
 if [ "$CROSS_BUILD" ]; then

From ab15b5bbc8bb7ed4439330c03a9c799c85374394 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 9 Jan 2021 23:52:08 +0100
Subject: [PATCH 454/752] baloo-widgets5: update to 20.12.1

[ci skip]
---
 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 adb1b1a650c..1cffc9d16fc 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=20.12.0
+version=20.12.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=9af708f4749effb02a87ef37decb3bd3cfe1365521290a49093f86da93dd1aa2
+checksum=23fb018485b778ef1e9eaa2a8f35e0becb64a3e928bf130033fd374d1b03be84
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 29521004b2f2285d78a252ada950e9ac97daca57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:03:47 +0100
Subject: [PATCH 455/752] okular: update to 20.12.1.

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

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index fa37d542457..070c5989374 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=20.12.0
+version=20.12.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=972c5395dad9c47b0251237b476d569bcd21855710a1bf8ec50fa7e6f0472bce
+checksum=2ca17ad0b2a1a0f9f70c7ca4bc1f44a9ed758b0ca6a8e5c9935a467f883df53e
 
 do_check() {
 	cd build

From f2c95f889d2ed52a97aedf282037edfe2c3f62d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:03:50 +0100
Subject: [PATCH 456/752] libkexiv25: update to 20.12.1.

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

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9b06da83c2a..5753ae0a6a6 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=20.12.0
+version=20.12.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=534a28648861f1d10e46a5b95c4c7dc27eb2028bf1e0cddd9814237d9c8d114c
+checksum=60b3c6d16ea02b335ce5b377e153e39268726d9b80187674547dccfe06f5d4ef
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 40d57be6501c5d05431ee4547b41575b0bd89706 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:04:08 +0100
Subject: [PATCH 457/752] spectacle: update to 20.12.1.

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

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index ba338ea34b3..a06767e0da5 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=20.12.0
+version=20.12.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=0efa48c9646c8df804d2dd474fbce7f131f3918d9acd10e43cf983f699768e1a
+checksum=3414bcb536ea63876342dab7a33a4b005897985b10da8e01628c297723a85a12

From 104d4768811aa8445883123e6798da284d9a7b00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:04:10 +0100
Subject: [PATCH 458/752] libkipi5: update to 20.12.1.

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

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 42013dbd162..0641ea914f2 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=20.12.0
+version=20.12.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=efb8b33f495a7481e2d1b69954980761f7f267dbc1d287cd1f77fe970d04b42e
+checksum=4f638ef8474527289f8dc1624625aa3bf3f339c3865f4a605a38c2976c70c4d2
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 5c692f6df0e057020e4e6e594680864a517fb704 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:04:46 +0100
Subject: [PATCH 459/752] ark: update to 20.12.1.

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

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index c6372b0f590..653c81d49b7 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=20.12.0
+version=20.12.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=b7bc762eca2f2cd9dc13ca583291133cec3c4f08ab72779a59b54c5d6e4e45b7
+checksum=357366960c4b1621ccc943465800938da3a8711985ca3fe1109151c8b952eaa3
 
 do_check() {
 	:

From 8b4935354ec13acade59a7adfc3ddd7eb9acf2dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:10 +0100
Subject: [PATCH 460/752] elisa: update to 20.12.1.

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

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 142afc60cb5..0281b57dbd6 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=20.12.0
+version=20.12.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=0e1bed3836da289361b9a9616caadf24479e184e6b8918747567b46535058508
+checksum=3e360105dd08296bee61d2d92adfc7311b46bdb813be5842f4f2fbd64fecafd2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 1d687ef6190f2d6b15f16f5246d682994f32ff86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:17 +0100
Subject: [PATCH 461/752] akonadi-calendar: update to 20.12.1

[ci skip]
---
 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 7c9bed43341..0255eab7818 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=20.12.0
+version=20.12.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=6171a6b6e7e20f4de5744fb514dd3ae804871c9fe93b92cf01cc978353992821
+checksum=85db4f06e8af322eb65ad1dd37a8a2eec6277b99d0012f3323f2fa3f8023fe7f
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 271ee54e0b295bcb0f55627a9f60ba5c754e2791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:20 +0100
Subject: [PATCH 462/752] akonadi-contacts: update to 20.12.1

[ci skip]
---
 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 758c8a92a97..c207df976d4 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=1e4d21c2897596db2f5d3b21a830c9ea9f247142bc4338013010db471f4c31bd
+checksum=34ab825e7a6e155363fc5d0b2505661dff612a836de9ea8ba5c61f602dd2ac3f
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From b663e03b6bf533a23879c7e197c027b39136740f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:27 +0100
Subject: [PATCH 463/752] akonadi-import-wizard: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 1f81c99eb9f..0cfa412f286 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dc9e87635312c641606dd42c24cc790c2d7de0b340474554ce907de8fcb1af7d
+checksum=ff9fff17f16cbdcc1fd76cc3612dab0d2642068bc7af9d3b839eae2ff67eb0f1
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 23ca38d5959a3500cc220c442b21d3ffb0eabdef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:30 +0100
Subject: [PATCH 464/752] akonadi-mime: update to 20.12.1

[ci skip]
---
 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 11a0e5dd29c..358d62080e2 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=20.12.0
+version=20.12.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=bf6d0a4dd15c26bdffb4b20d6de3ca35fa5e09440c0e02f6206941d45154885b
+checksum=e58f1c794cfc0891ec920366572f588d2392352a751e6297a29a7e710a6259f7
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From ce504980af2d792ff7817fc87ddfecd7d650ff93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:33 +0100
Subject: [PATCH 465/752] akonadi-notes: update to 20.12.1

[ci skip]
---
 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 738cf8c3000..cc0ced117ee 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=20.12.0
+version=20.12.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=d6237903b79d31e0a685d955c77fc216ce3ac0fcefeaec3e9326ad80d008eccd
+checksum=959f6964407e03801faf1b6f563b97ed57feed85e0c6c53a73b1fa092a1fa295
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0443d09da055336656c8e07eb61c66d07d918fcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:36 +0100
Subject: [PATCH 466/752] akonadi-search: update to 20.12.1

[ci skip]
---
 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 6c27e33cb92..2b1edd1077a 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=20.12.0
+version=20.12.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=1e5c3d22c412e25e4a93a0ab02bd94bd652965752d9001aa87ca10596766061c
+checksum=08115ac4fd33a423d6b9f68d6cdde360808b84961029bb0074e408e4ecb8b818
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From bce5f70e88969af59ab3bb2844c37f24b9833a7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:39 +0100
Subject: [PATCH 467/752] calendarsupport: update to 20.12.1

[ci skip]
---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 0b97d0ecf7b..993e4c02476 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=20.12.0
+version=20.12.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=2a8fa770904c81d1f9452f2782507263c2ee8a07a5affc3ef847ea89335ed31b
+checksum=37738b20a369350d90cec17d186927e5dd9f092e88952886b9787fd3b7908ca9
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d04dd38756fce932176bab20e09850b28c977d10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:43 +0100
Subject: [PATCH 468/752] grantleetheme: update to 20.12.1

[ci skip]
---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 207affc4fb7..cf4c46d5e82 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=20.12.0
+version=20.12.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=0cfa0cb1f169e60c77a5a62551a1e9f7f31a2f4caea13f129420cfa314cd141c
+checksum=9ded145cfa1f5fa11f1bdcc7c31e7e449e3018383962c04328762c9ac0bf07f1
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 1fa8d357d753057383afc1dae82736fc110b754f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:49 +0100
Subject: [PATCH 469/752] kalarmcal: update to 20.12.1

[ci skip]
---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index a8df8c91e96..42e8a587132 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=20.12.0
+version=20.12.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/${pkgname}-${version}.tar.xz"
-checksum=7a6c76edfafbfc10b3f392ce05eca4921904df321c395dbc9a5b036439c924d6
+checksum=45f3aca13d0c124bd3c057503a67d6a0a189cd80e6f4a3f331170857055e8e80
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b3b2db7bb8dc8154f6a2190d4fba0f06f77c0ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:05:52 +0100
Subject: [PATCH 470/752] kdepim-apps-libs: update to 20.12.1

[ci skip]
---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index b13a6f6b216..c65ce324cd7 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=20.12.0
+version=20.12.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=c89cc5278e2701ac25445b0cb637468b26a3d54da1f81d67b9b49920017f70bf
+checksum=baebb2b8d3f1bf7d46b284ee255caf8668da48eb28251efb5d380ca7914dfc2c
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From cd1102c363c62af0a7b33308f85af26cea3db105 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:03 +0100
Subject: [PATCH 471/752] kdepim-runtime: update to 20.12.1

[ci skip]
---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index e5b753c6543..9abba2b0acf 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6dd4cd1328aeb2699a51abf41056b7bb009104803a3f2cf70fc4966b21344b01
+checksum=f82aa8448d01e0e5a3af69581a9188411072541159574640fd8c8b0adbeae7da
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 03c1aa0cee8c47c7507bdb72d4b175f6cb1d63de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:07 +0100
Subject: [PATCH 472/752] kimap: update to 20.12.1

[ci skip]
---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 691c06ed2a8..dad2145ca22 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=20.12.0
+version=20.12.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/kimap-${version}.tar.xz"
-checksum=d2f355e11f61bc25dc448b2943824940e34f918803b5af0e0079d7a914575354
+checksum=9bd0b19ec6f8bacb6cf6d2e47949eaa470dde4a7359fd8da1d3cebb1ea55d4f4
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From a31af5daa8b4e12746e539b03cec8d435b081549 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:11 +0100
Subject: [PATCH 473/752] kldap: update to 20.12.1

[ci skip]
---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 5b9f10604d6..ee9f1808428 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=20.12.0
+version=20.12.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=938c6dfd79fcfb02aac1b08467bceab99994f861197fef82694dfa6eb3b44b02
+checksum=63923db7e4a8985a3f2c6020e232ef62f20e89ccbf210966402db820d384840b
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d9f949cd7142b42ebb9555ced2578cd0ee395190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:21 +0100
Subject: [PATCH 474/752] kmail: update to 20.12.1

[ci skip]
---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index cb15ac7be2c..5e98eb1b862 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=20.12.0
+version=20.12.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=89ded51ac8d33c62a15ba592b2beca13d05670541cc1515567ad30e4a6d7a5f2
+checksum=fc35e6d433f47d7764fed5caf58535fc1dda3c8e1b82d2991b0fd724fa291489

From 11302678e06974d69bf457df0c01b99776f182a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:25 +0100
Subject: [PATCH 475/752] kmail-account-wizard: update to 20.12.1

[ci skip]
---
 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 3289a300219..21993aaa5e4 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=20.12.0
+version=20.12.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=b14cbd75209c9e294e781ab6051f3519df1ae8559a78da409c8697a0bdee8aa3
+checksum=365e917e68b8427c3dbda3f3f7c99d6ab53b632dd78333754ecc7b7aecbe84be

From fcec2ba01005710c782b40cb3cf5c21b6ebc488a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:28 +0100
Subject: [PATCH 476/752] kmailtransport: update to 20.12.1

[ci skip]
---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index ffa38942394..b8b8eb4fe08 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=20.12.0
+version=20.12.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/kmailtransport-${version}.tar.xz"
-checksum=3ead5834ecb409f04114b30656ac8849f118929dd88cd5b120338e1c50b0bc1c
+checksum=95dea10d1b4b0f2c3abc2bce14ea9400745214ec8500bb0d3e34f63b61752422
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5e6ffe996ce3df6ad3affe5f90ffde7d40b2120b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:32 +0100
Subject: [PATCH 477/752] kmbox: update to 20.12.1

[ci skip]
---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 30a396d4431..c7c26677853 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=20.12.0
+version=20.12.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=c7f32faa9b9a6424c2fa063c9b0b84c3a250a7fcd37a056e3f3997428fd28ed3
+checksum=0d6fc76613d5cc84ecc0764cef68458ffa99aba6c230981aabf342abf01327f0
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 47282e35fad80bb9989eaa285691148caa61a26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:35 +0100
Subject: [PATCH 478/752] kmime: update to 20.12.1

[ci skip]
---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 2da58c4c545..49c50776d0d 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=20.12.0
+version=20.12.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=03375fd4963ad87c675b091c82e4d4ecfd5b17ed513964f7567a38e6b33caf64
+checksum=4299c59e65a4c74e5104d2349d3ce6eabc782be9a5008d1b882b2da210ac2543
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 6faf81efd4c156a1b4743cbf16e65be04a6f5e04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:38 +0100
Subject: [PATCH 479/752] kontactinterface: update to 20.12.1

[ci skip]
---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 799c35beb7b..d5dfd7bebdf 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=20.12.0
+version=20.12.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=cf947c8cde12af33c25bd1fcca9a7f25828b75b25c38ea5250a1b4a9d5d188bb
+checksum=923c18164e5973494cb30a0dc407714a3895895c241a43b44f5ae4b8797db469
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 85e6772efcf9294886049740c002a07eb231f94a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:42 +0100
Subject: [PATCH 480/752] ksmtp: update to 20.12.1

[ci skip]
---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index e31e78d0831..a78f93de115 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=20.12.0
+version=20.12.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=39682dc5464fd269c75eb67a363ae438ed1e3e0af0d1cb6a742dd6fe17e437f7
+checksum=affb69fb3efcd8a1eb761906bd01cfd250eac412f95668ac20674207d96350f9
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4e77a330ead96bdef1b6656cc0ed10733fced37b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:45 +0100
Subject: [PATCH 481/752] ktnef: update to 20.12.1

[ci skip]
---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 4dcb4181c5b..e2eb34247fe 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=20.12.0
+version=20.12.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=755307e99f7ced99695a19d3beceb074c0479db2670b8feed3c25b5b1f274f97
+checksum=cd9155107c2358d0c03ffdd22d9eeba6931ab9cbb9481e05ed97be0397aa04df
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8bae90b29599d1f68c935836e0103efddd82c5ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:48 +0100
Subject: [PATCH 482/752] libgravatar: update to 20.12.1

[ci skip]
---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 976bd4b2d14..e492061dac3 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=20.12.0
+version=20.12.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=8800c4a5270725abcaa1bc2c1739e5f5e8a56e403419581946dee7994a1df375
+checksum=327d019bd0d1cb4c4517a3b6608b979ffd81e112216cf682f14e7307ee717e89
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 33b1a21b0466c1848949ba5e012ad6489e8513b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:51 +0100
Subject: [PATCH 483/752] libkdepim: update to 20.12.1

[ci skip]
---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 7f304000921..1986e56926e 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=20.12.0
+version=20.12.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=587265834c1c05877e6a48fe1687e1907378cad10b3a13cc691ec5227b467a10
+checksum=8e6811dbed7ac89428345346275a19cca2eb378483f6a9e31f74e140b5eee24e
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From f0d9e57ffcabf784b0008ff62ff03628e2c0a525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:54 +0100
Subject: [PATCH 484/752] libkgapi: update to 20.12.1

[ci skip]
---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 9f391c918f7..7abbc520739 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=20.12.0
+version=20.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da3f183df9ae5efde8244a0558203a27d0905e94b6af8721e570ad9820c31009
+checksum=0df9a24e68d50f67e171ff5c6404891956c7fe675351bda8f8ab2a84ffa2a833
 
 do_check() {
 	:

From 1f5b9efc15af9b7ed5935b85ad4dfd8ad90b1018 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:06:58 +0100
Subject: [PATCH 485/752] libkleo: update to 20.12.1

[ci skip]
---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ef8a9fc5b76..1ec0abf1140 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=20.12.0
+version=20.12.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=9da666931763520582047cf472dac436b6efac076f0245befc0f884658c6f91e
+checksum=8a64e16316ab0365e2db1ef60ae4c4efdd81392f658069bdbe143209de350837
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b6900631247483aa7168c4add01781c4508ee246 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:02 +0100
Subject: [PATCH 486/752] libksieve: update to 20.12.1

[ci skip]
---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index ffecc38c187..d6804955122 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=20.12.0
+version=20.12.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=45698fe9b04b1c400094aef80920acbbf9a811e64db5a3ea3d821cc7c1578da7
+checksum=bfdd5e2602ebfb568978be45fe75fa77d4738bcca1dca96ff1cda1419b66ef1f
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 0ce7ef49da31c14b580e6fdf677fd8132b1104d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:06 +0100
Subject: [PATCH 487/752] mailcommon: update to 20.12.1

[ci skip]
---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 8fc185dcf79..9c9aab610e2 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=20.12.0
+version=20.12.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=d5601ae3b93f37216c726b8b0173b7af2023a29e9116c3c3fcf574cd944b76ce
+checksum=680c0592555a80211dcda96edb4ffde94f392bc6e7437c8490545a1206352da4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From ce1d2d932bb15423c231aaa66de97f880a7186b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:09 +0100
Subject: [PATCH 488/752] mailimporter: update to 20.12.1

[ci skip]
---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index dcb07a80fc3..164072202d5 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=20.12.0
+version=20.12.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=7b7b184ce4d9e59686f9d87c6e86869bae3dfec6e44d9af3370febc3bc206b73
+checksum=ac4b84cc505da734cdb8ed8cfc208029c44c08d57e5bdefb27ec46caef640d4b
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c0e8bbc7645e10b0a7fb55fc462845729993e3a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:32 +0100
Subject: [PATCH 489/752] messagelib: update to 20.12.1

[ci skip]
---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index ec1b714fabe..2780ded22c4 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=20.12.0
+version=20.12.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=b0a126d2544b3cdfb025caca6374dad2708e9112fe4118f8a94684a9c15fc3f1
+checksum=c77b7f87fceea1c0eda3ce540e6ffc4ed7155c8984cbbed189deeb09903e507a
 
 #TODO: fix build without qca-qt5
 

From ea80b3fffa6e4a73f5d6a54087d7f62763d71770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:35 +0100
Subject: [PATCH 490/752] pimcommon: update to 20.12.1

[ci skip]
---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 65c9c10b07f..27634640049 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=20.12.0
+version=20.12.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=54c6e51730bc10c67bade70a67f2500aa4fe4d2db32572bff3fecc4f7ab85c5c
+checksum=a7644e6a49b5fc29ff729ff688b841031b6d5d0f90e61e06eddb62ad77ddaaf0
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 3fb5a29b29998a76e2acc1b976811a5817a14c30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:38 +0100
Subject: [PATCH 491/752] kpimtextedit: update to 20.12.1

[ci skip]
---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index bfc8742a8fe..809a0470476 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=20.12.0
+version=20.12.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=64fb748137768b0450c202dfccaf085eb5711b5394283b73c39bc4a2c0a269e6
+checksum=64a532c9cefbc9127c51c92c4820b4f1d9240c1e588652c3ee1620ae3536a296
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From dfefe04d92f266204219eb531049f6a54d26aded Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:47 +0100
Subject: [PATCH 492/752] kidentitymanagement: update to 20.12.1

[ci skip]
---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index c34b5d7bc67..9b863b07af7 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=20.12.0
+version=20.12.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=1063a222119a7ac5197f3adb7367eb7a5ce562da7303b899c6f964d59f103d91
+checksum=c9d3a6aa4bef1b3864e7c5dd8def3f323c086321d9cedd142c131fcf574714b9
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 46bbdbc278ec5375ff4d393f59b8a5a36f2925f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:52 +0100
Subject: [PATCH 493/752] akonadi5: update to 20.12.1

[ci skip]
---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 0cbcdc88a19..a0c971b0301 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=20.12.0
+version=20.12.1
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -17,7 +17,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=37318b79992264e996d8afa14fa332e984a60e3a31de36f6da03ca395c2e6813
+checksum=b3f48ffe85fd5010138a7af3ec857b64f474dbaa9a2e54ec2ed811c48a19e384
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"

From 9be343a2afc463b9c079b48299757a1dbf8fdc10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:07:55 +0100
Subject: [PATCH 494/752] pim-data-exporter: update to 20.12.1

[ci skip]
---
 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 5e538b756cd..3274ea3bc5e 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=20.12.0
+version=20.12.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=b4af9554e1f425798340f9d6e8fb70e31305faaf4f071e8a7195b993bbeb5f48
+checksum=4c06f5c36614fd1ff25f86883c41a89fcd2ce59a90048c7ab1a0ff49e980344d

From 46c74d9aac7359fa7a3e88ed9504b167ce0c17f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:08:35 +0100
Subject: [PATCH 495/752] knights: update to 20.12.1.

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

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 75e92953fbb..69dc6efcad3 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=20.12.0
+version=20.12.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=0b3787ca018f221eb6182953ea4f2c2c573e4231e4dfae2582405574bdde576a
+checksum=4b2e0204584c1594ad5cba4ea6ea6003373300909854b44ec7232fa8e9e21e25

From 908c28575147bfabb5e9436f39c700622cf50db8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:08:38 +0100
Subject: [PATCH 496/752] kqtquickcharts: update to 20.12.1.

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

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index fcb939111ff..d2a07097708 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=20.12.0
+version=20.12.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=6034c27b6f75c7fba7c4bf468661022d8f7f38cf2728af82095b2de41eab2cb1
+checksum=ec524f2ea26b2773e111bfcb719ee977ff08506fde6059f52a6f4c6089dc4500
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a1e787614699e34039e4584d4721d171b795690d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 10 Jan 2021 22:09:44 +0100
Subject: [PATCH 497/752] yadm: update to 3.0.2.

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

diff --git a/srcpkgs/yadm/template b/srcpkgs/yadm/template
index 6e6a77ed547..d33617c085e 100644
--- a/srcpkgs/yadm/template
+++ b/srcpkgs/yadm/template
@@ -1,6 +1,6 @@
 # Template file for 'yadm'
 pkgname=yadm
-version=3.0.0
+version=3.0.2
 revision=1
 depends="bash git gnupg"
 short_desc="Yet Another Dotfiles Manager"
@@ -8,7 +8,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://yadm.io/"
 distfiles="https://github.com/TheLocehiliosan/${pkgname}/archive/${version}.tar.gz"
-checksum=af968c815817e9de85b60dc9c9a7e6159ed34e4f91ea78cadbcd6c73a0301c06
+checksum=724a8b61b09b70f5952cf14fd1786617bf88243a276b2d93dd7306feab13983c
 
 do_install() {
 	vbin ${pkgname}

From 391f387e643a91086553bb62dd144fe6529da636 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 7 Jan 2021 16:37:53 +0100
Subject: [PATCH 498/752] google-chrome: update to 87.0.4280.141

---
 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 092162dbf4e..c42eaa649c9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=87.0.4280.88
+_chromeVersion=87.0.4280.141
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=4bc68502dc5e22d5c264b3fb5d0a1ecfdadc3ba21d945646d8d37de4b8a96e58
+checksum=b7edb7cd5c166bf3c0a1d245baa5924e242c3b81b97090468bec778f41f40373
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From e3a00d476941f6b995ee7cc19f10419b8933cd94 Mon Sep 17 00:00:00 2001
From: SolitudeSF <solitudesf@protonmail.com>
Date: Mon, 11 Jan 2021 10:20:26 +0200
Subject: [PATCH 499/752] vkQuake: update to 1.05.2

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

diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 2ed54d584e4..58fecc6649d 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.05.1
+version=1.05.2
 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=4ced5d2756a04f2873fc3f1616b1b08c70baf6286496d08d0ce107985b56829a
+checksum=c2b01171fe241f394dae2044bd0990dfe5d487faee9956e016e277e759914e4c
 
 do_install() {
 	vbin vkquake

From dc527c3ad061777257d13b98b64a59155795765a Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Fri, 8 Jan 2021 16:54:36 +0100
Subject: [PATCH 500/752] openresolv: update to 3.12.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also fix homepage.

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
Closes: #27764 [via git-merge-pr]
---
 srcpkgs/openresolv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 15e7863cb6e..809771e6673 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -1,6 +1,6 @@
 # Template file for 'openresolv'
 pkgname=openresolv
-version=3.10.0
+version=3.12.0
 revision=2
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin"
@@ -8,9 +8,9 @@ hostmakedepends="runit"
 short_desc="Management framework for resolv.conf"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
-homepage="http://roy.marples.name/projects/openresolv/home"
-distfiles="http://roy.aydogan.net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4078bc52dee022f4a1c7594045e724af9da5ef16d670e0c08444d1830033ba06
+homepage="https://roy.marples.name/projects/openresolv"
+distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
+checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
 conf_files="/etc/resolvconf.conf"
 
 post_install() {

From f9ad32826d87e7614e9cc039fb7a76304be0a6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 11 Jan 2021 10:28:17 -0300
Subject: [PATCH 501/752] openresolv: reset revision.

Forgot to do so in 9f98fbf288fcf46729b723781d7d9faf4cf95e7e. Builders
were busy so the updated package hasn't been built yet.
---
 srcpkgs/openresolv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 809771e6673..3ed997c5fc5 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -1,7 +1,7 @@
 # Template file for 'openresolv'
 pkgname=openresolv
 version=3.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin"
 hostmakedepends="runit"

From 67a80794c4812ade6dae6162c8ead556c197921a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 15:22:58 +0100
Subject: [PATCH 502/752] jdupes: update to 1.19.1.

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

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 0cba17ea701..c17c9215484 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.19.0
+version=1.19.1
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=98676d3455c89882c3f7f4934602f9e7aca2b054caf3f0deaf286552ce9b276b
+checksum=bb7c53cd463ab5e21da85948c4662a3b7ac9b038ae993cc14ccf793d2472e2e9
 
 post_install() {
 	vlicense LICENSE

From 19e90fb1d8f890da73535ea8459b1e4a36271260 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 8 Jan 2021 15:25:57 -0500
Subject: [PATCH 503/752] retroarch: add support for Neon SIMD on armv7l

---
 srcpkgs/retroarch/template | 41 ++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index ac9283bbb63..c3ab2846259 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.0
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -80,17 +80,32 @@ if [ "$build_option_x11" ]; then
 	fi
 fi
 
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
-	fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		configure_args+=" --enable-sse --enable-threads"
+		;;
+	ppc*)
+		configure_args+=" --enable-threads"
+		;;
+	aarch64*)
+		configure_args+=" --enable-threads"
+		;;
+	armv7*)
+		build_options+=" neon"
+		build_options_default+=" neon"
+		desc_option_neon="Enable support for ARM Neon SIMD extension"
+
+		configure_args+=" --enable-threads $(vopt_enable neon)"
 
-	case "$XBPS_TARGET_MACHINE" in
-		i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
-		ppc*) configure_args+=" --enable-threads";;
-		aarch64*) configure_args+=" --disable-neon --enable-threads";;
-		armv7*) configure_args+=" --disable-neon --enable-threads";;
-		arm*) configure_args+=" --disable-neon";;
+		if [ "$build_option_neon" ]; then
+			CFLAGS+=" -mfpu=neon"
+		fi
+		;;
+	arm*)
+		configure_args+=" --disable-neon"
+		;;
 	esac
-	./configure ${configure_args}
-}
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
+fi

From 9af232ea97ed0652072f7d989adadfc858b9e203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:20:13 +0100
Subject: [PATCH 504/752] python3-pylast: update to 4.1.0

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

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 21f5cc6c6e7..2f37811d5ab 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
-version=4.0.0
+version=4.1.0
 revision=1
 wrksrc="pylast-${version}"
 build_style=python3-module
-pycompile_module="pylast"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Python3 interface to last.fm and libre.fm"
@@ -12,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
-checksum=8ec555d6c4c1b474e9b3c96c3786abd38303a1a5716d928b0f3cfdcb4499b093
+checksum=ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932

From af97a1aee6e441982c4085ba5ccdb35f62330953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:21:08 +0100
Subject: [PATCH 505/752] lollypop: update to 1.4.9

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

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 11c5105ecda..6cb8881ddd5 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.7
+version=1.4.9
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=748ffae06ceea356ae7fb4948e470f1c9fb4c2d8bdf395327ef9c247617d6b3d
+checksum=9423a6e474480b0a27153cdcf7f994c7f7ce4dbeb5a05809b1f40e3e9776f4ba

From 250a231c979c69a78fa40e68c8e217a0d3f54f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:27:41 +0100
Subject: [PATCH 506/752] parole: update to 4.16.0

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

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 4df335ffc4d..c902128411c 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
 # Template file for 'parole'
 pkgname=parole
-version=4.15.0
-revision=2
+version=4.16.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/parole/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=014431dc565dab4bf4760ec7c2ea7e787523f112aabc99888027213ebecc1f10
+checksum=0d305ad8ccd3974d6b632f74325b1b8a39304c905c6b405b70f52c4cfd55a7e7

From eee6518a28626dedbc72846fbb1958921d60083d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:49:06 +0100
Subject: [PATCH 507/752] libtorrent-rasterbar: update to 1.2.12

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

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index e7e0daed934..831e507c127 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,7 +1,7 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.11
+version=1.2.12
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
@@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=cb6a9cc3c9a9e485174394baa82744cef8415d23a357f5721dcc9ee7622c4efb
+checksum=c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild_tests=ON"

From e803e5428449141274007068ff980833bc8a86d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:51:39 +0100
Subject: [PATCH 508/752] tali: update to 3.38.3

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

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index d3b18e563a3..8de48032c97 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
 # Template file for 'tali'
 pkgname=tali
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
 hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=4fb9f7ee8cc0eb89010408c42cb0b1f83e839ac8e9b644ec3ddf564508431691
+checksum=0215428b50c4a0827fb0de2e4e6ba6e56678f9ba76d8d25b7eeca85215f25a39

From c3718a224fb5424d6b37678bcaba6bd42e20faa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 15:55:57 +0100
Subject: [PATCH 509/752] qxmpp: update to 1.3.2

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

diff --git a/srcpkgs/qxmpp/template b/srcpkgs/qxmpp/template
index 5af354f19e9..d640ab5a3f5 100644
--- a/srcpkgs/qxmpp/template
+++ b/srcpkgs/qxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'qxmpp'
 pkgname=qxmpp
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=false"
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1"
 homepage="https://github.com/qxmpp-project/qxmpp/"
 distfiles="https://github.com/qxmpp-project/qxmpp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=812e718a2dd762ec501a9012a1281b9b6c6d46ec38adbc6eec242309144e1c55
+checksum=016e23c40c604dd43b15e1888e31d48729d0f80775fb6f7faef1130a52fe0641
 
 build_options="opus speex theora vpx"
 build_options_default="opus speex theora vpx"

From 98c8c227ea419a7630558eb925ee5649327a0a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 16:51:58 +0100
Subject: [PATCH 510/752] mouseemu: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/mouseemu/patches/014-time64.patch | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/mouseemu/patches/014-time64.patch

diff --git a/srcpkgs/mouseemu/patches/014-time64.patch b/srcpkgs/mouseemu/patches/014-time64.patch
new file mode 100644
index 00000000000..580264708f0
--- /dev/null
+++ b/srcpkgs/mouseemu/patches/014-time64.patch
@@ -0,0 +1,39 @@
+--- a/mouseemu.c	2021-01-11 16:44:11.242213686 +0100
++++ b/mouseemu.c	2021-01-11 16:45:42.351171654 +0100
+@@ -80,6 +80,7 @@
+ static void send_event(int fd, int type, int code, int value)
+ {
+ 	struct input_event event;
++	struct timeval tv;
+ 
+ 	if (fd < 0)
+ 		return;
+@@ -87,7 +88,9 @@
+ 	event.type = type;
+ 	event.code = code;
+ 	event.value = value;
+-	gettimeofday(&event.time, NULL);
++	gettimeofday(&tv, NULL);
++	event.input_event_sec = tv.tv_sec;
++	event.input_event_usec = tv.tv_usec;
+ 	if (write(fd, &event, sizeof(event)) < sizeof(event))
+ 		perror("send_event");
+ 		
+@@ -197,7 +200,7 @@
+ 		return;
+ 
+ 	if (!event_parse(inp.code, inp.value) && !is_modifier(inp)) {
+-		last_key = (inp.time.tv_sec*1000000 + inp.time.tv_usec);
++		last_key = (inp.input_event_sec*1000000 + inp.input_event_usec);
+ 	}
+ 	/* I think its best not to pass scroll, or experiment with not passing the release if
+ 	 * we actually used it for scrolling (but some apps may get stuck?)
+@@ -228,7 +231,7 @@
+ 		report_scroll (inp.value);
+ 		//printf("inp.value %d\n", inp.value);
+ 	} else {
+-		if ((inp.time.tv_sec*1000000+inp.time.tv_usec)-last_key > typing_block_delay*1000 
++		if ((inp.input_event_sec*1000000+inp.input_event_usec)-last_key > typing_block_delay*1000 
+ 		|| inp.type == EV_REL)
+ 			passthrough(ui_mouse_fd, inp);
+ 	}

From 26ef397a41ac903f665daf19f2547e6676f46a7f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 15:51:13 +0100
Subject: [PATCH 511/752] byacc: update to 20210109.

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

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

From b2f9abf57ec1151bb771d238d674bdaf77c0a53c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 15:53:49 +0100
Subject: [PATCH 512/752] ocaml-zarith: update to 1.11.

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

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 65f9d4c0b9e..190d274fe58 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.9.1
-revision=3
+version=1.11
+revision=1
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-only,OCaml-LGPL-linking-exception"
 homepage="https://github.com/ocaml/zarith"
 distfiles="https://github.com/ocaml/zarith/archive/release-${version}.tar.gz"
-checksum=49be0214f34ae05e7a83b53351f134ba73eddaf87d1abb6f61b19943c211ca5d
+checksum=f996af120a10fd06a8272ae99b7affd57cef49c57a3a596e2f589147dd183684
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ocaml-zarith/update b/srcpkgs/ocaml-zarith/update
new file mode 100644
index 00000000000..d3094846993
--- /dev/null
+++ b/srcpkgs/ocaml-zarith/update
@@ -0,0 +1 @@
+pkgname=release

From f7358acf412435893e7b6e8351688189848c0d81 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 16:13:53 +0100
Subject: [PATCH 513/752] coq: update to 8.13.0.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index d71c89bae92..cf49b27d018 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,14 +1,14 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.12.2
+version=8.13.0
 revision=1
-hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
+hostmakedepends="camlp5 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=2c57416e3ec737b212610512eae7e40259fb17a4e487b49981556f28838e8b17
+checksum=06445dbd6cb3c8a2e4e957dbd12e094d609a62fcb0c8c3cad0cd1fdedda25c9b
 nopie=yes
 nocross=yes
 

From e4045cdbabe8ee727cb6d397efaf93c498692089 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 16:20:36 +0100
Subject: [PATCH 514/752] mathcomp: rebuild for coq-8.13.0.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 84fab1b3e74..0e284e748b6 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=1
+revision=2
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From ad995269fb389d138a64a18067bf5c292f8944f7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Jan 2021 16:21:55 +0100
Subject: [PATCH 515/752] linux5.10: update to 5.10.6.

---
 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 036afe14b15..f987b44e16a 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.5
+version=5.10.6
 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=3991a9e16a187d78d5f414d89236ae5d7f404a69e60c4c42a9d262ee19612ef4
+checksum=7767d02c1cb5eb2a8d3c2b15a3f93e85b98baa6e9d93a3b9e3ec0e959d0a690b
 python_version=3
 patch_args="-Np1"
 

From fa0c0fd89bb5dfe94b0caaa739a6cb89dd9a4075 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Jan 2021 15:24:20 +0100
Subject: [PATCH 516/752] ugrep: update to 3.1.2.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index af41ad214b8..7931ca3c836 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,4 +10,4 @@ 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=9afe1b9edc83478404fbcb47b1489c13ceb1101ae372d34b623c3521e5df0a44
+checksum=81de520a6db437455e8ae9ee4abbdc9dc875328a359b8620ef296bb8d8364310

From c73d7973509182116d89c7795d9edd9e971a238d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Jan 2021 15:25:31 +0100
Subject: [PATCH 517/752] perltidy: update to 20210111.

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

diff --git a/srcpkgs/perltidy/template b/srcpkgs/perltidy/template
index 6e7e903d0e1..0b7008fab4a 100644
--- a/srcpkgs/perltidy/template
+++ b/srcpkgs/perltidy/template
@@ -1,6 +1,6 @@
 # Template file for 'perltidy'
 pkgname=perltidy
-version=20201207
+version=20210111
 revision=1
 wrksrc="Perl-Tidy-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://metacpan.org/release/Perl-Tidy"
 distfiles="${CPAN_SITE}/Perl/Perl-Tidy-${version}.tar.gz"
-checksum=2e4504e493a623674fff9d5e5c0865467f198cf20444d5503dd9ddcd95003d11
+checksum=207666ceaf5d4eaf7a608c8f4a77f212cae811bb88ce159c33e2d8a0b5da189f

From 322be2165ce72150b686214263a13756ef61da3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Jan 2021 18:53:37 +0100
Subject: [PATCH 518/752] ocaml-zarith: needs gmp-devel for linking.

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

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 190d274fe58..642476093c2 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,12 +1,13 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
 version=1.11
-revision=1
+revision=2
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"
 hostmakedepends="perl"
 makedepends="gmp-devel ocaml ocaml-findlib"
+depends="gmp-devel"
 short_desc="OCaml operations over arbitrary-precision integers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-only,OCaml-LGPL-linking-exception"

From c1fe28d9dcf543804c36a06f18743617aae93956 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 10 Jan 2021 10:10:46 -0600
Subject: [PATCH 519/752] nvidia390: update to 390.141.

---
 common/shlibs                                 |   2 +-
 srcpkgs/nvidia390/files/linux-5.8.x.patch     |  29 --
 .../nvidia390/files/linux-5.9.x-x86_64.patch  |  58 ---
 srcpkgs/nvidia390/files/linux-5.9.x.patch     | 427 ------------------
 srcpkgs/nvidia390/template                    |  13 +-
 5 files changed, 5 insertions(+), 524 deletions(-)
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.8.x.patch
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.9.x.patch

diff --git a/common/shlibs b/common/shlibs
index 24c31d8621d..af01a679c70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -138,7 +138,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.390.138 nvidia390-libs-390.138_1 ignore
+libnvidia-fatbinaryloader.so.390.141 nvidia390-libs-390.141_1 ignore
 libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
diff --git a/srcpkgs/nvidia390/files/linux-5.8.x.patch b/srcpkgs/nvidia390/files/linux-5.8.x.patch
deleted file mode 100644
index 792cdb3afef..00000000000
--- a/srcpkgs/nvidia390/files/linux-5.8.x.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-linux.h	2020-05-14 14:29:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-linux.h	2020-09-10 21:56:45.927763032 +0200
-@@ -531,7 +531,11 @@
- 
- static inline void *nv_vmalloc(unsigned long size)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
-     void *ptr = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
-+#else
-+    void *ptr = __vmalloc(size, GFP_KERNEL);
-+#endif
-     if (ptr)
-         NV_MEMDBG_ADD(ptr, size);
-     return ptr;
---- NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-mm.h	2020-05-14 14:29:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.138-no-compat32/kernel/common/inc/nv-mm.h	2020-09-10 22:25:40.666693863 +0200
-@@ -29,6 +29,12 @@
- typedef int vm_fault_t;
- #endif
-
-+#include <linux/version.h> 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+/* kernel 5.8.0-rc1 renamed mmap_sem to mmap_lock */
-+#define mmap_sem mmap_lock
-+#endif
-+
- /* get_user_pages
-  *
-  * The 8-argument version of get_user_pages was deprecated by commit 
diff --git a/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch b/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
deleted file mode 100644
index bc55a467f9a..00000000000
--- a/srcpkgs/nvidia390/files/linux-5.9.x-x86_64.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: Mageia, http://sophie.zarb.org/rpms/eaff282f82f9fc9911151ebd234f25cc/files/7
-diff --git a/kernel/nvidia-uvm/nvidia-uvm.Kbuild b/kernel/nvidia-uvm/nvidia-uvm.Kbuild
-index 650c922..0c83fae 100644
---- a/kernel/nvidia-uvm/nvidia-uvm.Kbuild
-+++ b/kernel/nvidia-uvm/nvidia-uvm.Kbuild
-@@ -108,10 +108,11 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += bitmap_clear
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += usleep_range
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += radix_tree_empty
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += radix_tree_replace_slot
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += do_gettimeofday
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += ktime_get_raw_ts64
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += smp_read_barrier_depends
- 
- NV_CONFTEST_TYPE_COMPILE_TESTS += proc_dir_entry
- NV_CONFTEST_TYPE_COMPILE_TESTS += irq_handler_t
- NV_CONFTEST_TYPE_COMPILE_TESTS += outer_flush_all
- NV_CONFTEST_TYPE_COMPILE_TESTS += vm_operations_struct
-diff --git a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
-index 86dbb77..be865bc 100644
---- a/kernel/nvidia-uvm/uvm8_tools.c
-+++ b/kernel/nvidia-uvm/uvm8_tools.c
-@@ -188,11 +188,15 @@ static NV_STATUS tools_update_status(uvm_va_space_t *va_space);
- 
- static uvm_tools_event_tracker_t *tools_event_tracker(struct file *filp)
- {
-     long event_tracker = atomic_long_read((atomic_long_t *)&filp->private_data);
- 
-+#if defined(NV_SMP_READ_BARRIER_DEPENDS_PRESENT)
-     smp_read_barrier_depends();
-+#else
-+    smp_rmb();
-+#endif
-     return (uvm_tools_event_tracker_t *)event_tracker;
- }
- 
- static bool tracker_is_queue(uvm_tools_event_tracker_t *event_tracker)
- {
-diff --git a/kernel/nvidia-uvm/uvm8_va_range.h b/kernel/nvidia-uvm/uvm8_va_range.h
-index 8cae357..a74ad24 100644
---- a/kernel/nvidia-uvm/uvm8_va_range.h
-+++ b/kernel/nvidia-uvm/uvm8_va_range.h
-@@ -715,11 +715,15 @@ static uvm_va_block_t *uvm_va_range_block(uvm_va_range_t *va_range, size_t index
-     // Later accesses in this thread will read state out of block, potentially
-     // as soon as the block pointer is updated by another thread. We have to
-     // make sure that any initialization of this block by the creating thread is
-     // visible to later accesses in this thread, which requires a data
-     // dependency barrier.
-+#if defined(NV_SMP_READ_BARRIER_DEPENDS_PRESENT)
-     smp_read_barrier_depends();
-+#else
-+    smp_mb();
-+#endif
-     return block;
- }
- 
- // Same as uvm_va_range_block except that the block is created if not already
- // present in the array. If NV_OK is returned, the block has been allocated
-
diff --git a/srcpkgs/nvidia390/files/linux-5.9.x.patch b/srcpkgs/nvidia390/files/linux-5.9.x.patch
deleted file mode 100644
index 763ee4e5c08..00000000000
--- a/srcpkgs/nvidia390/files/linux-5.9.x.patch
+++ /dev/null
@@ -1,427 +0,0 @@
-Source: Mageia, http://sophie.zarb.org/rpms/eaff282f82f9fc9911151ebd234f25cc/files/8
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 37c6841..23efe9e 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -159,12 +159,14 @@ static inline uid_t __kuid_val(kuid_t uid)
- }
- #endif
- 
- #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
-+#if defined(NV_LINUX_IOCTL32_H_PRESENT)
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-+#endif
- 
- #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
-   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
- #error "struct file_operations compile test likely failed!"
- #endif
-diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
-index 8df26f1..e791bb2 100644
---- a/kernel/common/inc/nv-mm.h
-+++ b/kernel/common/inc/nv-mm.h
-@@ -146,10 +146,15 @@ typedef int vm_fault_t;
-         #if defined(NV_GET_USER_PAGES_REMOTE_HAS_LOCKED_ARG)
- 
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas, NULL);
- 
-+        #elif defined(NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG)
-+
-+               return get_user_pages_remote(mm, start, nr_pages, flags,
-+                                            pages, vmas, NULL);
-+
-         #else
- 
-                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
-                                             pages, vmas);
- 
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index cdb249c..54da233 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -132,10 +132,11 @@ test_headers() {
-     FILES="$FILES linux/sched/task_stack.h"
-     FILES="$FILES xen/ioemu.h"
-     FILES="$FILES linux/fence.h"
-     FILES="$FILES linux/ktime.h"
-     FILES="$FILES linux/dma-resv.h"
-+    FILES="$FILES linux/ioctl32.h"
- 
-     # Arch specific headers which need testing
-     FILES_ARCH="asm/book3s/64/hash-64k.h"
-     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
-     FILES_ARCH="$FILES_ARCH asm/powernv.h"
-@@ -2449,10 +2450,69 @@ compile_test() {
-             }"
- 
-             compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_LEGACY_DEV_LIST" "" "types"
-         ;;
- 
-+        drm_driver_has_gem_free_object)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-+            #include <drm/drm_drv.h>
-+            #endif
-+
-+            int conftest_drm_driver_has_gem_free_object(void) {
-+                return offsetof(struct drm_driver, gem_free_object);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT" "" "types"
-+        ;;
-+
-+        drm_display_mode_has_vrefresh)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-+            #include <drm/drm_drv.h>
-+            #endif
-+
-+            int conftest_drm_display_mode_has_vrefresh(void) {
-+                return offsetof(struct drm_display_mode, vrefresh);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_DISPLAY_MODE_HAS_VREFRESH" "" "types"
-+        ;;
-+
-+        drm_master_set_returns_int)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-+            #include <drm/drm_drv.h>
-+            #endif
-+
-+            static int nv_master_set(struct drm_device *x, struct drm_file *y, bool z)
-+            {
-+                return 1;
-+            }
-+
-+            int conftest_drm_master_set_returns_int(void) {
-+                struct drm_driver nv_drm_driver;
-+                nv_drm_driver.master_set = nv_master_set;
-+
-+                return nv_drm_driver.master_set(NULL, NULL, false);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_MASTER_SET_RETURNS_INT" "" "generic"
-+        ;;
-+
-         jiffies_to_timespec)
-             #
-             # Determine if jiffies_to_timespec() is present
-             #
-             # removed by commit 751addac78b6
-@@ -3138,10 +3198,33 @@ compile_test() {
-             else
-                 echo "#undef NV_GET_USER_PAGES_REMOTE_HAS_LOCKED_ARG" | append_conftest "functions"
-             fi
-             echo "#undef NV_GET_USER_PAGES_REMOTE_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
- 
-+            # conftest #4: check if get_user_pages_remote() has removed tsk argument
-+
-+            echo "$CONFTEST_PREAMBLE
-+            #include <linux/mm.h>
-+            long get_user_pages_remote(struct mm_struct *mm,
-+                                       unsigned long start,
-+                                       unsigned long nr_pages,
-+                                       unsigned int gup_flags,
-+                                       struct page **pages,
-+                                       struct vm_area_struct **vmas,
-+                                       int *locked) {
-+                return 0;
-+            }" > conftest$$.c
-+
-+            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+            rm -f conftest$$.c
-+
-+            if [ -f conftest$$.o ]; then
-+                echo "#define NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG" | append_conftest "functions"
-+                rm -f conftest$$.o
-+            else
-+                echo "#undef NV_GET_USER_PAGES_REMOTE_REMOVED_TSK_ARG" | append_conftest "functions"
-+            fi
-         ;;
- 
-         usleep_range)
-             #
-             # Determine if the function usleep_range() is present.
-@@ -3227,10 +3310,25 @@ compile_test() {
-                 echo "#undef NV_DRM_GEM_OBJECT_LOOKUP_PRESENT" | append_conftest "functions"
-                 echo "#undef NV_DRM_GEM_OBJECT_LOOKUP_ARGUMENT_COUNT" | append_conftest "functions"
-             fi
-         ;;
- 
-+        drm_gem_object_put_unlocked)
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+            #if defined(NV_DRM_DRM_GEM_H_PRESENT)
-+            #include <drm/drm_gem.h>
-+            #endif
-+            int conftest_drm_gem_object_put_unlocked(void) {
-+                drm_gem_object_put_unlocked();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT" "" "functions"
-+        ;;
-+
-         drm_master_drop_has_from_release_arg)
-             #
-             # Determine if drm_driver::master_drop() has 'from_release' argument.
-             #
-             # Last argument 'bool from_release' has been removed by:
-@@ -4129,10 +4227,30 @@ compile_test() {
-             }"
- 
-             compile_check_conftest "$CODE" "NV_PCI_DEV_HAS_SKIP_BUS_PM" "" "types"
-         ;;
- 
-+        smp_read_barrier_depends)
-+            CODE="
-+            #include <asm/barrier.h>
-+            void conftest_smp_read_barrier_depends(void) {
-+                smp_read_barrier_depends(0);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_SMP_READ_BARRIER_DEPENDS_PRESENT" "" "functions"
-+        ;;
-+
-+        vga_tryget)
-+            CODE="
-+            #include <linux/vgaarb.h>
-+            void conftest_vga_tryget(void) {
-+                vga_tryget();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_VGA_TRYGET_PRESENT" "" "functions"
-+        ;;
-+
-     esac
- }
- 
- case "$6" in
-     cc_sanity_check)
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 17e377d..95e035b 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -464,20 +464,29 @@ static void nv_drm_unload(struct drm_device *dev)
- }
- #endif
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
-+#if defined(NV_DRM_MASTER_SET_RETURNS_INT)
- static int nv_drm_master_set(struct drm_device *dev,
-                              struct drm_file *file_priv, bool from_open)
-+#else
-+static void nv_drm_master_set(struct drm_device *dev,
-+                              struct drm_file *file_priv, bool from_open)
-+#endif
- {
-     struct nv_drm_device *nv_dev = to_nv_device(dev);
- 
-+#if defined(NV_DRM_MASTER_SET_RETURNS_INT)
-     if (!nvKms->grabOwnership(nv_dev->pDevice)) {
-         return -EINVAL;
-     }
- 
-     return 0;
-+#else
-+    nvKms->grabOwnership(nv_dev->pDevice);
-+#endif
- }
- 
- #if defined(NV_DRM_MASTER_DROP_HAS_FROM_RELEASE_ARG)
- static
- void nv_drm_master_drop(struct drm_device *dev,
-@@ -675,11 +684,15 @@ static struct drm_driver nv_drm_driver = {
- #if defined(NV_DRM_DRIVER_PRIME_FLAG_PRESENT)
-                                DRIVER_PRIME |
- #endif
-                                DRIVER_GEM  | DRIVER_RENDER,
- 
-+#if defined(NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT)
-     .gem_free_object        = nv_drm_gem_free,
-+#else
-+    .gem_free_object_unlocked = nv_drm_gem_free,
-+#endif
- 
-     .ioctls                 = nv_drm_ioctls,
-     .num_ioctls             = ARRAY_SIZE(nv_drm_ioctls),
- 
-     .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
-index 37100ed..eb7b959 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.c
-@@ -41,11 +41,13 @@
- void nv_drm_gem_free(struct drm_gem_object *gem)
- {
-     struct drm_device *dev = gem->dev;
-     struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
- 
-+#if !defined(NV_DRM_DRIVER_HAS_GEM_FREE_OBJECT)
-     WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-+#endif
- 
-     /* Cleanup core gem object */
- 
-     drm_gem_object_release(&nv_gem->base);
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
-index 5691a7a..7fc6f69 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.h
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.h
-@@ -85,11 +85,15 @@ static inline struct nv_drm_gem_object *to_nv_gem_object(
- 
- static inline void
- nv_drm_gem_object_unreference_unlocked(struct nv_drm_gem_object *nv_gem)
- {
- #if defined(NV_DRM_GEM_OBJECT_GET_PRESENT)
-+#if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
-     drm_gem_object_put_unlocked(&nv_gem->base);
-+#else
-+    drm_gem_object_put(&nv_gem->base);
-+#endif
- #else
-     drm_gem_object_unreference_unlocked(&nv_gem->base);
- #endif
- }
- 
-@@ -136,11 +140,10 @@ void nv_drm_gem_object_init(struct nv_drm_device *nv_dev,
-     nv_dma_resv_init(&nv_gem->resv);
- 
- #if defined(NV_DRM_GEM_OBJECT_HAS_RESV)
-     nv_gem->base.resv = &nv_gem->resv;
- #endif
--
- #endif
- 
-     drm_gem_private_object_init(dev, &nv_gem->base, size);
- }
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-utils.c b/kernel/nvidia-drm/nvidia-drm-utils.c
-index 8cb2d5e..6460d4d 100644
---- a/kernel/nvidia-drm/nvidia-drm-utils.c
-+++ b/kernel/nvidia-drm/nvidia-drm-utils.c
-@@ -101,11 +101,13 @@ int nvkms_connector_type_to_drm_connector_type(NvKmsConnectorType type,
- 
- void
- nvkms_display_mode_to_drm_mode(const struct NvKmsKapiDisplayMode *displayMode,
-                                struct drm_display_mode *mode)
- {
-+#if defined(NV_DRM_DISPLAY_MODE_HAS_VREFRESH)
-     mode->vrefresh    = (displayMode->timings.refreshRate + 500) / 1000; /* In Hz */
-+#endif
- 
-     mode->clock       = (displayMode->timings.pixelClockHz + 500) / 1000; /* In Hz */
- 
-     mode->hdisplay    = displayMode->timings.hVisible;
-     mode->hsync_start = displayMode->timings.hSyncStart;
-@@ -187,11 +189,13 @@ bool drm_format_to_nvkms_format(u32 format,
- }
- 
- void drm_mode_to_nvkms_display_mode(const struct drm_display_mode *src,
-                                     struct NvKmsKapiDisplayMode *dst)
- {
-+#if defined(NV_DRM_DISPLAY_MODE_HAS_VREFRESH)
-     dst->timings.refreshRate  = src->vrefresh * 1000;
-+#endif
- 
-     dst->timings.pixelClockHz = src->clock * 1000; /* In Hz */
- 
-     dst->timings.hVisible   = src->hdisplay;
-     dst->timings.hSyncStart = src->hsync_start;
-diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
-index 4cfbbbc..d9dbab8 100644
---- a/kernel/nvidia-drm/nvidia-drm.Kbuild
-+++ b/kernel/nvidia-drm/nvidia-drm.Kbuild
-@@ -47,18 +47,20 @@ $(call ASSIGN_PER_OBJ_CFLAGS, $(NVIDIA_DRM_OBJECTS), $(NVIDIA_DRM_CFLAGS))
- 
- NV_OBJECTS_DEPEND_ON_CONFTEST += $(NVIDIA_DRM_OBJECTS)
- 
- NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_available
- NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_atomic_available
-+NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_master_set_returns_int
- NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_inc
- NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_dec_and_test
- 
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_dev_unref
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_reinit_primary_mode_group
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages_remote
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_user_pages
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_lookup
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_atomic_state_ref_counting
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_driver_has_gem_prime_res_obj
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_atomic_helper_connector_dpms
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_funcs_have_mode_in_name
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += vmf_insert_pfn
-@@ -70,10 +72,12 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_for_each_possible_encoder
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_present
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_bus_type
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_get_irq
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_bus_has_get_name
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_legacy_dev_list
-+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_gem_free_object
-+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_display_mode_has_vrefresh
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_set_busid
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_state_has_connectors_changed
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_init_function_args
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_connector_list_update_has_merge_type_bits_arg
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_helper_mode_fill_fb_struct
-diff --git a/kernel/nvidia-modeset/nvidia-modeset-linux.c b/kernel/nvidia-modeset/nvidia-modeset-linux.c
-index f7f1def..8fb2161 100644
---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c
-+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c
-@@ -49,12 +49,14 @@
- #endif
- 
- 
- #if NV_NEEDS_COMPAT_IOCTL_REGISTRATION
- #include <linux/syscalls.h> /* sys_ioctl() */
-+#if defined(NV_LINUX_IOCTL32_H_PRESENT)
- #include <linux/ioctl32.h> /* register_ioctl32_conversion() */
- #endif
-+#endif
- 
- #define NVKMS_MAJOR_DEVICE_NUMBER 195
- #define NVKMS_MINOR_DEVICE_NUMBER 254
- 
- #define NVKMS_LOG_PREFIX "nvidia-modeset: "
-diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
-index 15983f6..a7be80a 100644
---- a/kernel/nvidia/nv.c
-+++ b/kernel/nvidia/nv.c
-@@ -3870,11 +3870,15 @@ nvidia_probe
- 
-     pci_set_master(dev);
- 
- #if defined(CONFIG_VGA_ARB) && !defined(NVCPU_PPC64LE)
- #if defined(VGA_DEFAULT_DEVICE)
-+#if defined(NV_VGA_TRYGET_PRESENT)
-     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
-+#else
-+    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
-+#endif
- #endif
-     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
- #endif
- 
-     if (rm_get_cpu_type(sp, &nv_cpu_type) != NV_OK)
-
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 21ea5c04747..40301343166 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
-version=390.138
-revision=3
+version=390.141
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -22,11 +22,11 @@ conflicts="xserver-abi-video>24_1"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=7bf67323a393e857a09f979f155baa1ed13183653add0c344edf4d409f977878
+	checksum=8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=a34a19b618be0eb06c4699247489833a8f22c59423f246248614e0a59b1508da
+	checksum=d7d763aa52574b554dd3d8cbb93a6a63572a9c2bfd3bc3873ec5338c067f70ba
 fi
 
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
@@ -42,11 +42,6 @@ pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json
 	sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json
-	patch -Np1 < ${FILESDIR}/linux-5.8.x.patch
-	patch -Np1 < ${FILESDIR}/linux-5.9.x.patch
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		patch -Np1 < ${FILESDIR}/linux-5.9.x-x86_64.patch
-	fi
 }
 
 do_install() {

From b9b39b0b94973fc51de110586b8feb38a2ff16df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 21:38:17 +0100
Subject: [PATCH 520/752] sile: fix cross

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

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 3d47b117466..8e9f28786b9 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -16,7 +16,7 @@ distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sil
 checksum=60cdcc4509971973feab352dfc1a86217cc1fdb12d56823f04d863afef92003a
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib luafilesystem
+	hostmakedepends+=" lua51 lua51-devel lua51-lpeg luaexpat lua51-zlib luafilesystem
 	 luasocket lua51-luasec"
 fi
 

From 292e885a852641a9e4a263001b3e6aab51628158 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 11 Jan 2021 09:59:58 +0100
Subject: [PATCH 521/752] slack-desktop: update to 4.12.1

---
 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 a0c55ec0c28..d480ce6b5ca 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.12.0
+version=4.12.1
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=d5249ae7a88e0ed0f10b7536bdf549280158503b766f9c0bd45ff569ae337f93
+checksum=a9e71340a7d37cf9fbfa9206ad000038c0bb74fd3df445506cc740d6f0eb3ce6
 restricted=yes
 repository="nonfree"
 nopie=yes

From 6184f682d836a29653ba13e51e52d7e48cfbfb57 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 12:48:48 +0100
Subject: [PATCH 522/752] feh: update to 3.6.2.

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

diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 87fbc3b7071..7ed1d95af54 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,6 +1,6 @@
 # Template file for 'feh'
 pkgname=feh
-version=3.6.1
+version=3.6.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,7 +15,7 @@ license="MIT-feh"
 homepage="https://feh.finalrewind.org"
 changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog"
 distfiles="${homepage}/feh-${version}.tar.bz2"
-checksum=9b1edec52cbae97b17530cb5db10666abfb9983f51a5d820c89added6f7b1ea8
+checksum=1649fb79d1a1242938cd64a468fd2666c8b1174421b1050244f39e01d3c7c634
 
 pre_build() {
 	vsed -i 's|doc/feh/examples|examples/feh|' config.mk

From 0fbaf29e7dbd91bdb4378cb77361cc1115709139 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 11 Jan 2021 11:23:49 +0100
Subject: [PATCH 523/752] pokoy: update to 0.2.5

---
 srcpkgs/pokoy/patches/build.patch | 11 +++++------
 srcpkgs/pokoy/template            |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/pokoy/patches/build.patch b/srcpkgs/pokoy/patches/build.patch
index 94aeac57382..436217e37a3 100644
--- a/srcpkgs/pokoy/patches/build.patch
+++ b/srcpkgs/pokoy/patches/build.patch
@@ -1,13 +1,12 @@
-diff --git Makefile Makefile
-index 3e99b03..71b5fa1 100644
---- Makefile
+--- Makefile.orig
 +++ Makefile
-@@ -1,8 +1,7 @@
- VERSION		= 0.2
+@@ -1,8 +1,8 @@
+ VERSION		= 0.2.5
  CC          ?= gcc
  STRIP		?= strip
--CFLAGS      = -std=gnu11 -O2
+-CFLAGS      = -std=c99 -D_DEFAULT_SOURCE -O2
 -LDFLAGS 	= -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-screensaver
++CFLAGS      += -std=c99 -D_DEFAULT_SOURCE
 +LDFLAGS 	+= -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-screensaver
  
  SRCR 		= pokoy.c
diff --git a/srcpkgs/pokoy/template b/srcpkgs/pokoy/template
index d6cd835e818..490067f7d9f 100644
--- a/srcpkgs/pokoy/template
+++ b/srcpkgs/pokoy/template
@@ -1,13 +1,13 @@
 # Template file for 'pokoy'
 pkgname=pokoy
-version=0.2.2
+version=0.2.5
 revision=1
 build_style=gnu-makefile
-makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel"
 make_use_env=yes
+makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel"
 short_desc="Daemon that helps prevent RSI and other computer related stress"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/ttygde/pokoy"
 distfiles="https://github.com/ttygde/pokoy/archive/v${version}.tar.gz"
-checksum=9903146eeb0cb5c6c6f6484052a30946810a59d8fd392b8f49b48aaced82dc1e
+checksum=ae3ee5935e503d1f48f7fc8e4df2071e9d4586a52dfe778ef643deb28ca6a22f

From 5a5d46d95e2af8ab839c3c53a5b337e543888f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 11 Jan 2021 22:20:40 +0100
Subject: [PATCH 524/752] libunwind: fix mips*musl build w/ musl-1.2.1

---
 srcpkgs/libunwind/patches/mips-musl.patch     |  3 +-
 .../patches/mips-read_write_s32.patch         | 52 +++++++++++++++++++
 srcpkgs/libunwind/template                    |  1 +
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libunwind/patches/mips-read_write_s32.patch

diff --git a/srcpkgs/libunwind/patches/mips-musl.patch b/srcpkgs/libunwind/patches/mips-musl.patch
index b2bd99e78e8..6dac3d0789b 100644
--- a/srcpkgs/libunwind/patches/mips-musl.patch
+++ b/srcpkgs/libunwind/patches/mips-musl.patch
@@ -1,11 +1,10 @@
 --- src/mips/getcontext.S.orig
 +++ src/mips/getcontext.S
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,6 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
  
  #include "offsets.h"
 -#include <endian.h>
-+#include <bits/endian.h>
  
  	.text
  
diff --git a/srcpkgs/libunwind/patches/mips-read_write_s32.patch b/srcpkgs/libunwind/patches/mips-read_write_s32.patch
new file mode 100644
index 00000000000..d61d4b2cb52
--- /dev/null
+++ b/srcpkgs/libunwind/patches/mips-read_write_s32.patch
@@ -0,0 +1,52 @@
+--- include/tdep-mips/libunwind_i.h	2020-11-10 17:14:01.000000000 +0100
++++ include/tdep-mips/libunwind_i.h	2021-01-11 22:12:16.993539625 +0100
+@@ -148,9 +148,10 @@
+ static inline int
+ read_s32 (struct dwarf_cursor *c, unw_word_t addr, unw_word_t *val)
+ {
+-  int offset = addr & 4;
+   int ret;
+   unw_word_t memval;
++#if _MIPS_SIM == _ABI64
++  int offset = addr & 4;
+ 
+   ret = (*c->as->acc.access_mem) (c->as, addr - offset, &memval, 0, c->as_arg);
+   if (ret < 0)
+@@ -160,6 +161,13 @@
+     *val = (int32_t) memval;
+   else
+     *val = (int32_t) (memval >> 32);
++#else
++  ret = (*c->as->acc.access_mem) (c->as, addr, &memval, 0, c->as_arg);
++  if (ret < 0)
++    return ret;
++
++  *val = (int32_t) memval;
++#endif
+ 
+   return 0;
+ }
+@@ -167,9 +175,10 @@
+ static inline int
+ write_s32 (struct dwarf_cursor *c, unw_word_t addr, const unw_word_t *val)
+ {
+-  int offset = addr & 4;
+-  int ret;
+   unw_word_t memval;
++#if _MIPS_SIM == _ABI64
++  int offset = addr & 4;
++  int ret;
+ 
+   ret = (*c->as->acc.access_mem) (c->as, addr - offset, &memval, 0, c->as_arg);
+   if (ret < 0)
+@@ -181,6 +190,10 @@
+     memval = (memval & 0xffffffffLL) | (uint32_t) (*val << 32);
+ 
+   return (*c->as->acc.access_mem) (c->as, addr - offset, &memval, 1, c->as_arg);
++#else
++  memval =  (uint32_t) *val;
++  return (*c->as->acc.access_mem) (c->as, addr, &memval, 1, c->as_arg);
++#endif
+ }
+ 
+ /* FIXME: Implement these for the MIPS FPU.  */
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index 67bd6303e01..3ef73d90d5b 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -19,6 +19,7 @@ case "$XBPS_TARGET_MACHINE" in
 	i686-musl) LDFLAGS=" -lssp_nonshared" ;;
 	ppc64*-musl) makedepends+=" libucontext-devel"; LDFLAGS=" -lucontext" ;;
 	ppc*-musl) makedepends+=" libucontext-devel"; LDFLAGS=" -lucontext -lssp_nonshared" ;;
+	mips*-musl) CLAGS="-D_MIPS_SIM=_ABI32" ;;
 	*) ;;
 esac
 

From 2b8de66d1d86883da18988676fc32bddfd182994 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 11 Jan 2021 23:32:31 +0100
Subject: [PATCH 525/752] xsettingsd: update to 1.0.2.

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

diff --git a/srcpkgs/xsettingsd/template b/srcpkgs/xsettingsd/template
index 9dd6a2e528e..e2754ef0099 100644
--- a/srcpkgs/xsettingsd/template
+++ b/srcpkgs/xsettingsd/template
@@ -1,8 +1,8 @@
 # Template file for 'xsettingsd'
 pkgname=xsettingsd
-version=1.0.0
-revision=2
-build_style=scons
+version=1.0.2
+revision=1
+build_style=cmake
 hostmakedepends="pkg-config libX11-devel"
 makedepends="libX11-devel"
 short_desc="Daemon that implements the XSETTINGS specification"
@@ -10,12 +10,9 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/derat/xsettingsd"
 distfiles="https://github.com/derat/xsettingsd/archive/v${version}.tar.gz"
-checksum=fe0b895b999af94004dc2eabe6dd113c475e3464d548cfe4e545fc02978ba977
+checksum=69b5d1987608d1b5f2a0085f2f88cc55936a99b92279118e655d665ebb5e50d3
 
-do_install() {
-	vbin xsettingsd
-	vbin dump_xsettings
-	vman xsettingsd.1
-	vman dump_xsettings.1
+post_install() {
 	vlicense COPYING
+	rm -rf "${DESTDIR}/usr/lib/systemd"
 }

From 63b7b22a001ecccfad3ed1278b93c2bc38c037b0 Mon Sep 17 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, 10 Jan 2021 18:24:50 +0700
Subject: [PATCH 526/752] xnoise: remove package

- Unmaintained for more than 6 years
- Crash on start up on musl
- reported hanging on glibc
---
 common/shlibs                     |  1 -
 srcpkgs/libxnoise                 |  1 -
 srcpkgs/removed-packages/template |  5 ++++-
 srcpkgs/xnoise-devel              |  1 -
 srcpkgs/xnoise/template           | 35 -------------------------------
 5 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 120000 srcpkgs/libxnoise
 delete mode 120000 srcpkgs/xnoise-devel
 delete mode 100644 srcpkgs/xnoise/template

diff --git a/common/shlibs b/common/shlibs
index af01a679c70..3a329c443a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -913,7 +913,6 @@ libfm.so.4 libfm-1.2.3_3
 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2
 libfm-extra.so.4 libfm-extra-1.2.3_3
 libunique-1.0.so.0 libunique1-1.1.6_1
-libxnoise.so.0 libxnoise-0.1.29_1
 libdiscid.so.0 libdiscid-0.2.2_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
diff --git a/srcpkgs/libxnoise b/srcpkgs/libxnoise
deleted file mode 120000
index 5cfcc50a50a..00000000000
--- a/srcpkgs/libxnoise
+++ /dev/null
@@ -1 +0,0 @@
-xnoise
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c3b79f436a5..e5b9cac33fa 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=7
+revision=8
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -77,6 +77,9 @@ replaces="
  vte-python<=0.28.2_16
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
+ libxnoise<=0.2.21_4
+ xnoise<=0.2.21_4
+ xnoise-devel<=0.2.21_4
  yt-play<=20140117_2
  nvidia340<=340.108_4
  nvidia340-dkms<=340.108_4
diff --git a/srcpkgs/xnoise-devel b/srcpkgs/xnoise-devel
deleted file mode 120000
index 5cfcc50a50a..00000000000
--- a/srcpkgs/xnoise-devel
+++ /dev/null
@@ -1 +0,0 @@
-xnoise
\ No newline at end of file
diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
deleted file mode 100644
index 61cc909b6ad..00000000000
--- a/srcpkgs/xnoise/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'xnoise'
-pkgname=xnoise
-version=0.2.21
-revision=4
-lib32disabled=yes
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel libtaginfo-devel sqlite-devel
- libnotify-devel libsoup-devel gst-plugins-base1-devel gst-plugins-good1
- desktop-file-utils hicolor-icon-theme"
-depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1"
-short_desc="Media player for GTK+ with a slick GUI"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.xnoise-media-player.com/"
-distfiles="https://bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-${version}.tar.gz"
-checksum=6c501091ac5a59aa0596978aa8d4750cc12d6bc9a823fd57542d9ab8e3366681
-
-libxnoise_package() {
-	short_desc+=" - shared library"
-	pkg_install() {
-		vmove "usr/lib/libxnoise.so.*"
-	}
-}
-
-xnoise-devel_package() {
-	depends="libxnoise>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove usr/share/vala
-	}
-}

From 2b6d115e27dda5db7a472a3b1cb958add9661e36 Mon Sep 17 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, 9 Jan 2021 16:47:40 +0700
Subject: [PATCH 527/752] albatross-themes: not depends on gtk+

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

diff --git a/srcpkgs/albatross-themes/template b/srcpkgs/albatross-themes/template
index ce8a344c343..92d165f209f 100644
--- a/srcpkgs/albatross-themes/template
+++ b/srcpkgs/albatross-themes/template
@@ -1,18 +1,17 @@
 # Template file for 'albatross-themes'
 pkgname=albatross-themes
 version=1.7.4
-revision=3
-build_style=fetch
-depends="gtk+"
+revision=4
+wrksrc=Albatross-$version
 short_desc="Elegant black GTK2/3/Metacity/Xfwm theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
 homepage="https://github.com/shimmerproject/Albatross"
 distfiles="https://github.com/shimmerproject/Albatross/archive/v${version}.tar.gz"
 checksum=ff40e28e164cb99f01b131ae3e79a07782e29a720535460e901ce305fa322ae1
 
 do_install() {
-	bsdtar xzf v${version}.tar.gz
 	vmkdir usr/share/themes
-	vcopy Albatross-${version} usr/share/themes/Albatross
+	rm -f .gitignore LICENSE* README
+	vcopy . usr/share/themes/Albatross
 }

From 1a431ab676a452f06f70f0391cd5a0247d0cd62a Mon Sep 17 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, 9 Jan 2021 16:49:58 +0700
Subject: [PATCH 528/752] blackbird-themes: not depends on gtk+

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

diff --git a/srcpkgs/blackbird-themes/template b/srcpkgs/blackbird-themes/template
index 68ced568cbc..5c7cdd7082e 100644
--- a/srcpkgs/blackbird-themes/template
+++ b/srcpkgs/blackbird-themes/template
@@ -1,9 +1,8 @@
 # Template file for 'blackbird-themes'
 pkgname=blackbird-themes
 version=0.4
-revision=4
-build_style=fetch
-depends="gtk+"
+revision=5
+wrksrc=Blackbird-$version
 short_desc="Elegant dark GTK2/3/Metacity/Xfwm theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later"
@@ -12,7 +11,7 @@ distfiles="https://github.com/shimmerproject/Blackbird/archive/v${version}.tar.g
 checksum=ca31362254df2d336b2b090deb925f19a1dba72632ed9c7f82cf406be89ec1e6
 
 do_install() {
-	bsdtar xzf v${version}.tar.gz
 	vmkdir usr/share/themes
-	vcopy Blackbird-${version} usr/share/themes/Blackbird
+	rm README .gitignore
+	vcopy . usr/share/themes/Blackbird
 }

From 62f3098a9486f62855215bd3c7d078cb9e80691e Mon Sep 17 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, 9 Jan 2021 17:00:55 +0700
Subject: [PATCH 529/752] bluebird-themes: build gtk+3 themes

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

diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index ad67f8bc960..a9f4e852df1 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -1,9 +1,10 @@
 # Template file for 'bluebird-themes'
 pkgname=bluebird-themes
 version=1.3
-revision=2
-build_style=fetch
-depends="gtk+"
+revision=3
+wrksrc=Bluebird-$version
+build_style=gnu-configure
+hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg-utils"
 short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later"
@@ -11,8 +12,6 @@ homepage="https://github.com/shimmerproject/Bluebird"
 distfiles="https://github.com/shimmerproject/Bluebird/archive/v${version}.tar.gz"
 checksum=b8da767c0ed66e2c0e8c2f78a8c827d8757634179b114a1352590f4e6d0b32c8
 
-do_install() {
-	bsdtar xzf v${version}.tar.gz
-	vmkdir usr/share/themes
-	vcopy Bluebird-${version} usr/share/themes/Bluebird
+pre_configure() {
+	autoreconf -fi
 }

From 7ff55bd1217eded497a1232b544ff32696a323d8 Mon Sep 17 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, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 530/752] genius: load l10n from /usr/share

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

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 1c6b32747f5a70cab368023c5eebadd3d3cada99 Mon Sep 17 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, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 531/752] lxappearance: load l10n from /usr/share

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

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 7cdd2fb926ba15c062f09e08e212588c842ec387 Mon Sep 17 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, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 532/752] desmume: remove l10n dir

---
 srcpkgs/desmume/template | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..3afaa5027f7 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,15 +1,16 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
-makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel glu-devel"
+makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel
+ gtk+-devel agg-devel zziplib-devel glu-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +20,13 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_install() {
+	# locales is only used for glade, but it's never built
+	# The configure script set GETTEXT_PACKAGE to empty string
+	# this it's never usable.
+	# /usr/lib/locale/nb/LC_MESSAGES/.mo
+	# /usr/share/locale/nb/LC_MESSAGES/.mo
+	rm -rf $DESTDIR/usr/lib/locale
+	rm -rf $DESTDIR/usr/share/locale
+}

From a733fc133f4b801d9343e7cdc6d6cb1eb6ecdc66 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Fri, 8 Jan 2021 13:36:54 -0500
Subject: [PATCH 533/752] vivaldi: update to 3.5.2115.87.

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 8b0cb4113a1..4380b1de8bf 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.5.2115.81
+version=3.5.2115.87
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=38a18fe2624994cbc9782d7805ec058774e54e99e0ade6ad5e85da45055c9e5c
+	checksum=c02ea30b222a695b2fae5c7e2c62b51876ef3171cccde18e59a2b569a4161c54
 else
 	_debarch=i386
-	checksum=5c53dc84f1192d90349d5959848b106f542423268b6a5fa4d77119ba4a997e12
+	checksum=9c8ac7bd04efbef76b27f82fc6c754a1743ac5b5ba012810e77e2d16ff1a463a
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From 3ec1eb4092b28476844d9334bedb1bdf45e85705 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Dec 2020 15:21:39 +0100
Subject: [PATCH 534/752] tuxc: remove package

---
 srcpkgs/removed-packages/template |  3 ++-
 srcpkgs/tuxc/template             | 16 ----------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/tuxc/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e5b9cac33fa..1391ec55958 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=8
+revision=9
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -70,6 +70,7 @@ replaces="
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
  ttyload-git<=20141117_4
+ tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
  vte<=0.28.2_16
diff --git a/srcpkgs/tuxc/template b/srcpkgs/tuxc/template
deleted file mode 100644
index 861291aef0b..00000000000
--- a/srcpkgs/tuxc/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'tuxc'
-pkgname=tuxc
-version=1.1
-revision=3
-build_style="gnu-makefile"
-hostmakedepends="pkg-config"
-makedepends="lua53-devel"
-short_desc="Modular universal package manager wrapper"
-maintainer="Logen Kain <logen@sudotask.com>"
-license="ISC"
-homepage="https://github.com/logenkain/tuxc/"
-distfiles="https://github.com/logenkain/${pkgname}/archive/v${version}.tar.gz"
-checksum=164c905c4278422c8d75c7be9dfe3b92d0f820bccdae296b9e0db762f5ef614f
-post_install() {
-	vlicense LICENSE
-}

From ece91426c5b346eaa9c2d0b9486d922ae7301571 Mon Sep 17 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, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 535/752] brasero: fix l10n dir

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

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 5fee87f84f7f431236c8fb404440b403919b4dd4 Mon Sep 17 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, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 536/752] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From f99ef1ef05764ae1365d294315141fa0ee06c738 Mon Sep 17 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, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 537/752] dia: fix l10n dir

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

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 875ecc66057291ed55f0a08972020c04deee2055 Mon Sep 17 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, 12 Jan 2021 07:40:41 +0700
Subject: [PATCH 538/752] openresolv: use cached distfiles for a while

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

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 3ed997c5fc5..7676f2c2fc4 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -10,6 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/openresolv"
 distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
+distfiles="https://sources.voidlinux.org/openresolv-$version/openresolv-$version.tar.xz"
 checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
 conf_files="/etc/resolvconf.conf"
 

From c58014fb9acb8387709fd1b1cd97b08fa423cb69 Mon Sep 17 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, 12 Jan 2021 07:41:54 +0700
Subject: [PATCH 539/752] Revert "openresolv: use cached distfiles for a while"

This reverts commit 669f5d1a9f879ee619ef41d3c2f54007dfabc388.
---
 srcpkgs/openresolv/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index 7676f2c2fc4..3ed997c5fc5 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -10,7 +10,6 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/openresolv"
 distfiles="https://roy.marples.name/downloads/openresolv/${pkgname}-${version}.tar.xz"
-distfiles="https://sources.voidlinux.org/openresolv-$version/openresolv-$version.tar.xz"
 checksum=42b30508e857a228535c631eaac936862d86eca68c14b5c0bf387ba176b91b97
 conf_files="/etc/resolvconf.conf"
 

From 8ca0dce5d7f37b1d7c54146b03446250424f4358 Mon Sep 17 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, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 540/752] gconf-editor: fix l10n dir

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

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 148a14556294e0a620fa01e5b82a65cd2b7cd40b Mon Sep 17 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, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 541/752] gdmap: fix l10n dir

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

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From ccedbe692eee4f6665fc42537e1722d978e4692f Mon Sep 17 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, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 542/752] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 31432c7fd54412ac6ae7f260e75d60b4cd72a69d Mon Sep 17 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, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 543/752] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 8cc6f3ff992fc9f8aced9bd7ffd69764fd571ad0 Mon Sep 17 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, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 544/752] gnome-mime-data: fix l10n dir

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

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d39697b48854665288bf1232ed57c7c7a0b0879c Mon Sep 17 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, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 545/752] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From b762222ac2872c8515b11381ab62f73fff67ee82 Mon Sep 17 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, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 546/752] gnome-nettool: fix l10n dir

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

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 48e34b8260ae404f8c94a0835f07b1a4e799d261 Mon Sep 17 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, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 547/752] gnome-system-log: fix l10n dir

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

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a74afec56b9e69c05b9b9e655e3772fd7df22d5a Mon Sep 17 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, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 548/752] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..21dd938564e 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,11 +22,16 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/libspreadsheet.so
 	}
 }

From 9e69a3c9de6142854663ca0e24c02cde4928906c Mon Sep 17 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, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 549/752] gpicview: fix l10n dir

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

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From b63a3da6467db9d801749dbd4f54135200610692 Mon Sep 17 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, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 550/752] gtkpod: fix l10n dir

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

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 1eb2c2be2ad18611c95de85d613c42ba88217429 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 00:55:31 +0200
Subject: [PATCH 551/752] butt: update to 0.1.27.

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

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 6e67147ec84..d78e567f0aa 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,6 +1,6 @@
 # Template file for 'butt'
 pkgname=butt
-version=0.1.25
+version=0.1.27
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://danielnoethen.de"
 changelog="https://danielnoethen.de/butt/Changelog.html"
 distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=7c9f44227584e30040315a5c86419bf3e654bd3523634d34b18c9017206334cb
+checksum=e19a9b457414d2ca68947b49f4c3180ca8b3210b1c4f3925d71eacf1d47bab87

From 62cd9e055487d4e48284db6f861b17f918a5734e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 00:40:10 +0200
Subject: [PATCH 552/752] mdcat: update to 0.22.2.

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

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index ce16fbe5a00..9a91d162d53 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,6 +1,6 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.22.1
+version=0.22.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
@@ -11,4 +11,4 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=b14846542fb8b60ac0235b399136372df7569aa59ed63f3faf88ff7a485abe5f
+checksum=92102c448c1742aa69604817d7d209c69ce1db5261cb6d8f0bb98cdc6c4f02f9

From 17f67925a2132fa1cf83f46c6f708e881f5b143e Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Mon, 11 Jan 2021 16:21:39 -0500
Subject: [PATCH 553/752] ssr: update to 0.4.3

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

diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template
index 5a67fafc7de..a6439c742b2 100644
--- a/srcpkgs/ssr/template
+++ b/srcpkgs/ssr/template
@@ -1,19 +1,19 @@
 # Template file for 'ssr'
 pkgname=ssr
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_QT5=ON"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel ffmpeg-devel glu-devel jack-devel pulseaudio-devel
- qt5-tools-devel qt5-x11extras-devel libXinerama-devel"
+ qt5-tools-devel qt5-x11extras-devel libXinerama-devel v4l-utils-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple Screen Recorder for programs and games"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.maartenbaert.be/simplescreenrecorder/"
 distfiles="https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"
-checksum=a6da4979c7c3f402ea93e43f1c55e289cdcc69653a1a128e32e8bd59481b2511
+checksum=03b5f6cd613b504f8b2351c2728a6fd070aa0cc98e709bcafdcf93b672bd2b71
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 9989aefac9bdb94e191880309bb40fbadb269f03 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:38:29 +0200
Subject: [PATCH 554/752] man-pages: update to 5.10.

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

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

From 9f407a05da4d727489afdb09b7f166ee1d5d8968 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 12 Jan 2021 00:13:49 +0300
Subject: [PATCH 555/752] gallery-dl: update to 1.16.3

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

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 72fee5ca564..83bc94c2ecd 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.16.0
+version=1.16.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=260fa553e055efa8c080779d001d53db0366398450a0f362f707e753ef54f078
+checksum=ca1b8069a614fdc1f71ba9b33c157c1a0557efa8a77793236e2de4b20d27c053
 
 do_check() {
 	make test

From 2e0a1236c1bce159f9ed71cb1a31488ff9c18f6b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 00:21:16 +0200
Subject: [PATCH 556/752] FeatherPad: update to 0.17.1.

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

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index c1e097d2ae6..3ebfc5d376f 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.16.0
+version=0.17.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=781f092611cd330bd365df68b3b8793cfef8ae13b59f10494e4d0813832a0a2f
+checksum=021fd515979483df93d8652dabab6cdd4d383ee4bbbe8a091a597a8e497fe61f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"

From e1bfaa0c719012a596393e60943ec0111ca05afc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:04:53 +0200
Subject: [PATCH 557/752] kvantum: update to 0.18.0.

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

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

From 4b0360646745765e9e561f4ae914add9e2f83f5e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:11:21 +0200
Subject: [PATCH 558/752] zim: update to 0.73.4.

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

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index 94f33ed850b..5fcc9a5a594 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,6 +1,6 @@
 # Template file for 'zim'
 pkgname=zim
-version=0.73.3
+version=0.73.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://zim-wiki.org/"
 distfiles="http://zim-wiki.org/downloads/${pkgname}-${version}.tar.gz"
-checksum=a1f03d31682278b5432156b629ea3f2494e6f999d5947b7805114a4661e59300
+checksum=1f729d3390a04221a086526e9a894526c4d02b154af59ad535123066155213da

From 3e4c44a7319b5c5183e7476dc406b965ce155169 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 01:29:50 +0200
Subject: [PATCH 559/752] phoronix-test-suite: update to 10.2.0.

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

diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 1273816a25f..eae4ccbe817 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,7 +1,7 @@
 # Template file for 'phoronix-test-suite'
 pkgname=phoronix-test-suite
-version=9.6.1
-revision=2
+version=10.2.0
+revision=1
 wrksrc="$pkgname"
 depends="php"
 short_desc="Comprehensive testing and benchmarking platform for Linux"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.phoronix-test-suite.com/"
 changelog="https://raw.githubusercontent.com/phoronix-test-suite/phoronix-test-suite/master/ChangeLog"
 distfiles="https://phoronix-test-suite.com/releases/${pkgname}-${version}.tar.gz"
-checksum=8afae3056aae06a9a5a8aa80e3706eeeb22e3b9ba7d6e7784506ff1b1788cce2
+checksum=7a828781b4b2384930ce48b9c16b9994e0266658f138c5dcced03f83c4edbad4
 
 do_install() {
 	vsed -e "s/^\texport PTS_DIR=.*/\texport PTS_DIR=\/usr\/share\/webapps\/${pkgname}/g" -i phoronix-test-suite

From 1aa7e19b61c838badbb3f795a94ba4c8a14259a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 11 Jan 2021 23:59:51 +0200
Subject: [PATCH 560/752] bacon: update to 4.3, orphan.

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

diff --git a/srcpkgs/bacon/template b/srcpkgs/bacon/template
index bc4dd296265..89405034d6c 100644
--- a/srcpkgs/bacon/template
+++ b/srcpkgs/bacon/template
@@ -1,18 +1,18 @@
 # Template file for 'bacon'
 pkgname=bacon
-version=4.2
+version=4.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-bash --enable-gui-fltk"
-hostmakedepends="pkg-config m4 which"
+hostmakedepends="pkg-config m4 which flex"
 makedepends="fltk-devel"
 short_desc="BASIC to C converter"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.basic-converter.org"
 changelog="https://www.basic-converter.org/stable/CHANGES"
 distfiles="http://www.basic-converter.org/stable/bacon-${version}.tar.gz"
-checksum=03906139e9bc815d47635fdb92ded3f88376e38bb900fe3388aeb78a660defe2
+checksum=657eabca5870fb7db1e34100392af1c0f841d4a4ba7910b44c50302ca288b4f0
 disable_parallel_build=yes
 nocross=yes
 

From d887422b295c64d6a0095afef8ba37c0f4642c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 11 Jan 2021 11:00:37 -0300
Subject: [PATCH 561/752] lshw: clean up musl patches.

musl-path_max was no longer necessary, and musl-confname_h was kind of
helping them do the wrong thing. They should just be using the value of
LONG_BIT instead of trying to pass it to sysconf, so the usage was wrong
on glibc and musl. _SC_LONG_BIT is a glibc extension and shouldn't be at
all needed.

Since this does change behavior (sysconf(LONG_BIT) could return
arbitrary values), revbump the package.
---
 srcpkgs/lshw/files/confname.h              | 676 ---------------------
 srcpkgs/lshw/patches/musl-confname_h.patch |  15 -
 srcpkgs/lshw/patches/musl-long_bits.patch  |  20 +
 srcpkgs/lshw/patches/musl-path_max.patch   |  12 -
 srcpkgs/lshw/template                      |   7 +-
 5 files changed, 21 insertions(+), 709 deletions(-)
 delete mode 100644 srcpkgs/lshw/files/confname.h
 delete mode 100644 srcpkgs/lshw/patches/musl-confname_h.patch
 create mode 100644 srcpkgs/lshw/patches/musl-long_bits.patch
 delete mode 100644 srcpkgs/lshw/patches/musl-path_max.patch

diff --git a/srcpkgs/lshw/files/confname.h b/srcpkgs/lshw/files/confname.h
deleted file mode 100644
index 1972849cec3..00000000000
--- a/srcpkgs/lshw/files/confname.h
+++ /dev/null
@@ -1,676 +0,0 @@
-/* `sysconf', `pathconf', and `confstr' NAME values.  Generic version.
-   Copyright (C) 1993-2015 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined(_CONFNAME_H)
-#define _CONFNAME_H
-
-/* Values for the NAME argument to `pathconf' and `fpathconf'.  */
-enum
-  {
-    _PC_LINK_MAX,
-#define	_PC_LINK_MAX			_PC_LINK_MAX
-    _PC_MAX_CANON,
-#define	_PC_MAX_CANON			_PC_MAX_CANON
-    _PC_MAX_INPUT,
-#define	_PC_MAX_INPUT			_PC_MAX_INPUT
-    _PC_NAME_MAX,
-#define	_PC_NAME_MAX			_PC_NAME_MAX
-    _PC_PATH_MAX,
-#define	_PC_PATH_MAX			_PC_PATH_MAX
-    _PC_PIPE_BUF,
-#define	_PC_PIPE_BUF			_PC_PIPE_BUF
-    _PC_CHOWN_RESTRICTED,
-#define	_PC_CHOWN_RESTRICTED		_PC_CHOWN_RESTRICTED
-    _PC_NO_TRUNC,
-#define	_PC_NO_TRUNC			_PC_NO_TRUNC
-    _PC_VDISABLE,
-#define _PC_VDISABLE			_PC_VDISABLE
-    _PC_SYNC_IO,
-#define	_PC_SYNC_IO			_PC_SYNC_IO
-    _PC_ASYNC_IO,
-#define	_PC_ASYNC_IO			_PC_ASYNC_IO
-    _PC_PRIO_IO,
-#define	_PC_PRIO_IO			_PC_PRIO_IO
-    _PC_SOCK_MAXBUF,
-#define	_PC_SOCK_MAXBUF			_PC_SOCK_MAXBUF
-    _PC_FILESIZEBITS,
-#define _PC_FILESIZEBITS		_PC_FILESIZEBITS
-    _PC_REC_INCR_XFER_SIZE,
-#define _PC_REC_INCR_XFER_SIZE		_PC_REC_INCR_XFER_SIZE
-    _PC_REC_MAX_XFER_SIZE,
-#define _PC_REC_MAX_XFER_SIZE		_PC_REC_MAX_XFER_SIZE
-    _PC_REC_MIN_XFER_SIZE,
-#define _PC_REC_MIN_XFER_SIZE		_PC_REC_MIN_XFER_SIZE
-    _PC_REC_XFER_ALIGN,
-#define _PC_REC_XFER_ALIGN		_PC_REC_XFER_ALIGN
-    _PC_ALLOC_SIZE_MIN,
-#define _PC_ALLOC_SIZE_MIN		_PC_ALLOC_SIZE_MIN
-    _PC_SYMLINK_MAX,
-#define _PC_SYMLINK_MAX			_PC_SYMLINK_MAX
-    _PC_2_SYMLINKS
-#define _PC_2_SYMLINKS			_PC_2_SYMLINKS
-  };
-
-/* Values for the argument to `sysconf'.  */
-enum
-  {
-    _SC_ARG_MAX,
-#define	_SC_ARG_MAX			_SC_ARG_MAX
-    _SC_CHILD_MAX,
-#define	_SC_CHILD_MAX			_SC_CHILD_MAX
-    _SC_CLK_TCK,
-#define	_SC_CLK_TCK			_SC_CLK_TCK
-    _SC_NGROUPS_MAX,
-#define	_SC_NGROUPS_MAX			_SC_NGROUPS_MAX
-    _SC_OPEN_MAX,
-#define	_SC_OPEN_MAX			_SC_OPEN_MAX
-    _SC_STREAM_MAX,
-#define	_SC_STREAM_MAX			_SC_STREAM_MAX
-    _SC_TZNAME_MAX,
-#define	_SC_TZNAME_MAX			_SC_TZNAME_MAX
-    _SC_JOB_CONTROL,
-#define	_SC_JOB_CONTROL			_SC_JOB_CONTROL
-    _SC_SAVED_IDS,
-#define	_SC_SAVED_IDS			_SC_SAVED_IDS
-    _SC_REALTIME_SIGNALS,
-#define	_SC_REALTIME_SIGNALS		_SC_REALTIME_SIGNALS
-    _SC_PRIORITY_SCHEDULING,
-#define	_SC_PRIORITY_SCHEDULING		_SC_PRIORITY_SCHEDULING
-    _SC_TIMERS,
-#define	_SC_TIMERS			_SC_TIMERS
-    _SC_ASYNCHRONOUS_IO,
-#define	_SC_ASYNCHRONOUS_IO		_SC_ASYNCHRONOUS_IO
-    _SC_PRIORITIZED_IO,
-#define	_SC_PRIORITIZED_IO		_SC_PRIORITIZED_IO
-    _SC_SYNCHRONIZED_IO,
-#define	_SC_SYNCHRONIZED_IO		_SC_SYNCHRONIZED_IO
-    _SC_FSYNC,
-#define	_SC_FSYNC			_SC_FSYNC
-    _SC_MAPPED_FILES,
-#define	_SC_MAPPED_FILES		_SC_MAPPED_FILES
-    _SC_MEMLOCK,
-#define	_SC_MEMLOCK			_SC_MEMLOCK
-    _SC_MEMLOCK_RANGE,
-#define	_SC_MEMLOCK_RANGE		_SC_MEMLOCK_RANGE
-    _SC_MEMORY_PROTECTION,
-#define	_SC_MEMORY_PROTECTION		_SC_MEMORY_PROTECTION
-    _SC_MESSAGE_PASSING,
-#define	_SC_MESSAGE_PASSING		_SC_MESSAGE_PASSING
-    _SC_SEMAPHORES,
-#define	_SC_SEMAPHORES			_SC_SEMAPHORES
-    _SC_SHARED_MEMORY_OBJECTS,
-#define	_SC_SHARED_MEMORY_OBJECTS	_SC_SHARED_MEMORY_OBJECTS
-    _SC_AIO_LISTIO_MAX,
-#define	_SC_AIO_LISTIO_MAX		_SC_AIO_LISTIO_MAX
-    _SC_AIO_MAX,
-#define	_SC_AIO_MAX			_SC_AIO_MAX
-    _SC_AIO_PRIO_DELTA_MAX,
-#define	_SC_AIO_PRIO_DELTA_MAX		_SC_AIO_PRIO_DELTA_MAX
-    _SC_DELAYTIMER_MAX,
-#define	_SC_DELAYTIMER_MAX		_SC_DELAYTIMER_MAX
-    _SC_MQ_OPEN_MAX,
-#define	_SC_MQ_OPEN_MAX			_SC_MQ_OPEN_MAX
-    _SC_MQ_PRIO_MAX,
-#define	_SC_MQ_PRIO_MAX			_SC_MQ_PRIO_MAX
-    _SC_VERSION,
-#define	_SC_VERSION			_SC_VERSION
-    _SC_PAGESIZE,
-#define	_SC_PAGESIZE			_SC_PAGESIZE
-#define	_SC_PAGE_SIZE			_SC_PAGESIZE
-    _SC_RTSIG_MAX,
-#define	_SC_RTSIG_MAX			_SC_RTSIG_MAX
-    _SC_SEM_NSEMS_MAX,
-#define	_SC_SEM_NSEMS_MAX		_SC_SEM_NSEMS_MAX
-    _SC_SEM_VALUE_MAX,
-#define	_SC_SEM_VALUE_MAX		_SC_SEM_VALUE_MAX
-    _SC_SIGQUEUE_MAX,
-#define	_SC_SIGQUEUE_MAX		_SC_SIGQUEUE_MAX
-    _SC_TIMER_MAX,
-#define	_SC_TIMER_MAX			_SC_TIMER_MAX
-
-    /* Values for the argument to `sysconf'
-       corresponding to _POSIX2_* symbols.  */
-    _SC_BC_BASE_MAX,
-#define	_SC_BC_BASE_MAX			_SC_BC_BASE_MAX
-    _SC_BC_DIM_MAX,
-#define	_SC_BC_DIM_MAX			_SC_BC_DIM_MAX
-    _SC_BC_SCALE_MAX,
-#define	_SC_BC_SCALE_MAX		_SC_BC_SCALE_MAX
-    _SC_BC_STRING_MAX,
-#define	_SC_BC_STRING_MAX		_SC_BC_STRING_MAX
-    _SC_COLL_WEIGHTS_MAX,
-#define	_SC_COLL_WEIGHTS_MAX		_SC_COLL_WEIGHTS_MAX
-    _SC_EQUIV_CLASS_MAX,
-#define	_SC_EQUIV_CLASS_MAX		_SC_EQUIV_CLASS_MAX
-    _SC_EXPR_NEST_MAX,
-#define	_SC_EXPR_NEST_MAX		_SC_EXPR_NEST_MAX
-    _SC_LINE_MAX,
-#define	_SC_LINE_MAX			_SC_LINE_MAX
-    _SC_RE_DUP_MAX,
-#define	_SC_RE_DUP_MAX			_SC_RE_DUP_MAX
-    _SC_CHARCLASS_NAME_MAX,
-#define	_SC_CHARCLASS_NAME_MAX		_SC_CHARCLASS_NAME_MAX
-
-    _SC_2_VERSION,
-#define	_SC_2_VERSION			_SC_2_VERSION
-    _SC_2_C_BIND,
-#define	_SC_2_C_BIND			_SC_2_C_BIND
-    _SC_2_C_DEV,
-#define	_SC_2_C_DEV			_SC_2_C_DEV
-    _SC_2_FORT_DEV,
-#define	_SC_2_FORT_DEV			_SC_2_FORT_DEV
-    _SC_2_FORT_RUN,
-#define	_SC_2_FORT_RUN			_SC_2_FORT_RUN
-    _SC_2_SW_DEV,
-#define	_SC_2_SW_DEV			_SC_2_SW_DEV
-    _SC_2_LOCALEDEF,
-#define	_SC_2_LOCALEDEF			_SC_2_LOCALEDEF
-
-    _SC_PII,
-#define	_SC_PII				_SC_PII
-    _SC_PII_XTI,
-#define	_SC_PII_XTI			_SC_PII_XTI
-    _SC_PII_SOCKET,
-#define	_SC_PII_SOCKET			_SC_PII_SOCKET
-    _SC_PII_INTERNET,
-#define	_SC_PII_INTERNET		_SC_PII_INTERNET
-    _SC_PII_OSI,
-#define	_SC_PII_OSI			_SC_PII_OSI
-    _SC_POLL,
-#define	_SC_POLL			_SC_POLL
-    _SC_SELECT,
-#define	_SC_SELECT			_SC_SELECT
-    _SC_UIO_MAXIOV,
-#define	_SC_UIO_MAXIOV			_SC_UIO_MAXIOV
-    _SC_IOV_MAX = _SC_UIO_MAXIOV,
-#define _SC_IOV_MAX			_SC_IOV_MAX
-    _SC_PII_INTERNET_STREAM,
-#define	_SC_PII_INTERNET_STREAM		_SC_PII_INTERNET_STREAM
-    _SC_PII_INTERNET_DGRAM,
-#define	_SC_PII_INTERNET_DGRAM		_SC_PII_INTERNET_DGRAM
-    _SC_PII_OSI_COTS,
-#define	_SC_PII_OSI_COTS		_SC_PII_OSI_COTS
-    _SC_PII_OSI_CLTS,
-#define	_SC_PII_OSI_CLTS		_SC_PII_OSI_CLTS
-    _SC_PII_OSI_M,
-#define	_SC_PII_OSI_M			_SC_PII_OSI_M
-    _SC_T_IOV_MAX,
-#define	_SC_T_IOV_MAX			_SC_T_IOV_MAX
-
-    /* Values according to POSIX 1003.1c (POSIX threads).  */
-    _SC_THREADS,
-#define	_SC_THREADS			_SC_THREADS
-    _SC_THREAD_SAFE_FUNCTIONS,
-#define _SC_THREAD_SAFE_FUNCTIONS	_SC_THREAD_SAFE_FUNCTIONS
-    _SC_GETGR_R_SIZE_MAX,
-#define	_SC_GETGR_R_SIZE_MAX		_SC_GETGR_R_SIZE_MAX
-    _SC_GETPW_R_SIZE_MAX,
-#define	_SC_GETPW_R_SIZE_MAX		_SC_GETPW_R_SIZE_MAX
-    _SC_LOGIN_NAME_MAX,
-#define	_SC_LOGIN_NAME_MAX		_SC_LOGIN_NAME_MAX
-    _SC_TTY_NAME_MAX,
-#define	_SC_TTY_NAME_MAX		_SC_TTY_NAME_MAX
-    _SC_THREAD_DESTRUCTOR_ITERATIONS,
-#define	_SC_THREAD_DESTRUCTOR_ITERATIONS _SC_THREAD_DESTRUCTOR_ITERATIONS
-    _SC_THREAD_KEYS_MAX,
-#define	_SC_THREAD_KEYS_MAX		_SC_THREAD_KEYS_MAX
-    _SC_THREAD_STACK_MIN,
-#define	_SC_THREAD_STACK_MIN		_SC_THREAD_STACK_MIN
-    _SC_THREAD_THREADS_MAX,
-#define	_SC_THREAD_THREADS_MAX		_SC_THREAD_THREADS_MAX
-    _SC_THREAD_ATTR_STACKADDR,
-#define	_SC_THREAD_ATTR_STACKADDR	_SC_THREAD_ATTR_STACKADDR
-    _SC_THREAD_ATTR_STACKSIZE,
-#define	_SC_THREAD_ATTR_STACKSIZE	_SC_THREAD_ATTR_STACKSIZE
-    _SC_THREAD_PRIORITY_SCHEDULING,
-#define	_SC_THREAD_PRIORITY_SCHEDULING	_SC_THREAD_PRIORITY_SCHEDULING
-    _SC_THREAD_PRIO_INHERIT,
-#define	_SC_THREAD_PRIO_INHERIT		_SC_THREAD_PRIO_INHERIT
-    _SC_THREAD_PRIO_PROTECT,
-#define	_SC_THREAD_PRIO_PROTECT		_SC_THREAD_PRIO_PROTECT
-    _SC_THREAD_PROCESS_SHARED,
-#define	_SC_THREAD_PROCESS_SHARED	_SC_THREAD_PROCESS_SHARED
-
-    _SC_NPROCESSORS_CONF,
-#define _SC_NPROCESSORS_CONF		_SC_NPROCESSORS_CONF
-    _SC_NPROCESSORS_ONLN,
-#define _SC_NPROCESSORS_ONLN		_SC_NPROCESSORS_ONLN
-    _SC_PHYS_PAGES,
-#define _SC_PHYS_PAGES			_SC_PHYS_PAGES
-    _SC_AVPHYS_PAGES,
-#define _SC_AVPHYS_PAGES		_SC_AVPHYS_PAGES
-    _SC_ATEXIT_MAX,
-#define _SC_ATEXIT_MAX			_SC_ATEXIT_MAX
-    _SC_PASS_MAX,
-#define _SC_PASS_MAX			_SC_PASS_MAX
-
-    _SC_XOPEN_VERSION,
-#define _SC_XOPEN_VERSION		_SC_XOPEN_VERSION
-    _SC_XOPEN_XCU_VERSION,
-#define _SC_XOPEN_XCU_VERSION		_SC_XOPEN_XCU_VERSION
-    _SC_XOPEN_UNIX,
-#define _SC_XOPEN_UNIX			_SC_XOPEN_UNIX
-    _SC_XOPEN_CRYPT,
-#define _SC_XOPEN_CRYPT			_SC_XOPEN_CRYPT
-    _SC_XOPEN_ENH_I18N,
-#define _SC_XOPEN_ENH_I18N		_SC_XOPEN_ENH_I18N
-    _SC_XOPEN_SHM,
-#define _SC_XOPEN_SHM			_SC_XOPEN_SHM
-
-    _SC_2_CHAR_TERM,
-#define _SC_2_CHAR_TERM			_SC_2_CHAR_TERM
-    _SC_2_C_VERSION,
-#define _SC_2_C_VERSION			_SC_2_C_VERSION
-    _SC_2_UPE,
-#define _SC_2_UPE			_SC_2_UPE
-
-    _SC_XOPEN_XPG2,
-#define _SC_XOPEN_XPG2			_SC_XOPEN_XPG2
-    _SC_XOPEN_XPG3,
-#define _SC_XOPEN_XPG3			_SC_XOPEN_XPG3
-    _SC_XOPEN_XPG4,
-#define _SC_XOPEN_XPG4			_SC_XOPEN_XPG4
-
-    _SC_CHAR_BIT,
-#define	_SC_CHAR_BIT			_SC_CHAR_BIT
-    _SC_CHAR_MAX,
-#define	_SC_CHAR_MAX			_SC_CHAR_MAX
-    _SC_CHAR_MIN,
-#define	_SC_CHAR_MIN			_SC_CHAR_MIN
-    _SC_INT_MAX,
-#define	_SC_INT_MAX			_SC_INT_MAX
-    _SC_INT_MIN,
-#define	_SC_INT_MIN			_SC_INT_MIN
-    _SC_LONG_BIT,
-#define	_SC_LONG_BIT			_SC_LONG_BIT
-    _SC_WORD_BIT,
-#define	_SC_WORD_BIT			_SC_WORD_BIT
-    _SC_MB_LEN_MAX,
-#define	_SC_MB_LEN_MAX			_SC_MB_LEN_MAX
-    _SC_NZERO,
-#define	_SC_NZERO			_SC_NZERO
-    _SC_SSIZE_MAX,
-#define	_SC_SSIZE_MAX			_SC_SSIZE_MAX
-    _SC_SCHAR_MAX,
-#define	_SC_SCHAR_MAX			_SC_SCHAR_MAX
-    _SC_SCHAR_MIN,
-#define	_SC_SCHAR_MIN			_SC_SCHAR_MIN
-    _SC_SHRT_MAX,
-#define	_SC_SHRT_MAX			_SC_SHRT_MAX
-    _SC_SHRT_MIN,
-#define	_SC_SHRT_MIN			_SC_SHRT_MIN
-    _SC_UCHAR_MAX,
-#define	_SC_UCHAR_MAX			_SC_UCHAR_MAX
-    _SC_UINT_MAX,
-#define	_SC_UINT_MAX			_SC_UINT_MAX
-    _SC_ULONG_MAX,
-#define	_SC_ULONG_MAX			_SC_ULONG_MAX
-    _SC_USHRT_MAX,
-#define	_SC_USHRT_MAX			_SC_USHRT_MAX
-
-    _SC_NL_ARGMAX,
-#define	_SC_NL_ARGMAX			_SC_NL_ARGMAX
-    _SC_NL_LANGMAX,
-#define	_SC_NL_LANGMAX			_SC_NL_LANGMAX
-    _SC_NL_MSGMAX,
-#define	_SC_NL_MSGMAX			_SC_NL_MSGMAX
-    _SC_NL_NMAX,
-#define	_SC_NL_NMAX			_SC_NL_NMAX
-    _SC_NL_SETMAX,
-#define	_SC_NL_SETMAX			_SC_NL_SETMAX
-    _SC_NL_TEXTMAX,
-#define	_SC_NL_TEXTMAX			_SC_NL_TEXTMAX
-
-    _SC_XBS5_ILP32_OFF32,
-#define _SC_XBS5_ILP32_OFF32		_SC_XBS5_ILP32_OFF32
-    _SC_XBS5_ILP32_OFFBIG,
-#define _SC_XBS5_ILP32_OFFBIG		_SC_XBS5_ILP32_OFFBIG
-    _SC_XBS5_LP64_OFF64,
-#define _SC_XBS5_LP64_OFF64		_SC_XBS5_LP64_OFF64
-    _SC_XBS5_LPBIG_OFFBIG,
-#define _SC_XBS5_LPBIG_OFFBIG		_SC_XBS5_LPBIG_OFFBIG
-
-    _SC_XOPEN_LEGACY,
-#define _SC_XOPEN_LEGACY		_SC_XOPEN_LEGACY
-    _SC_XOPEN_REALTIME,
-#define _SC_XOPEN_REALTIME		_SC_XOPEN_REALTIME
-    _SC_XOPEN_REALTIME_THREADS,
-#define _SC_XOPEN_REALTIME_THREADS	_SC_XOPEN_REALTIME_THREADS
-
-    _SC_ADVISORY_INFO,
-#define _SC_ADVISORY_INFO		_SC_ADVISORY_INFO
-    _SC_BARRIERS,
-#define _SC_BARRIERS			_SC_BARRIERS
-    _SC_BASE,
-#define _SC_BASE			_SC_BASE
-    _SC_C_LANG_SUPPORT,
-#define _SC_C_LANG_SUPPORT		_SC_C_LANG_SUPPORT
-    _SC_C_LANG_SUPPORT_R,
-#define _SC_C_LANG_SUPPORT_R		_SC_C_LANG_SUPPORT_R
-    _SC_CLOCK_SELECTION,
-#define _SC_CLOCK_SELECTION		_SC_CLOCK_SELECTION
-    _SC_CPUTIME,
-#define _SC_CPUTIME			_SC_CPUTIME
-    _SC_THREAD_CPUTIME,
-#define _SC_THREAD_CPUTIME		_SC_THREAD_CPUTIME
-    _SC_DEVICE_IO,
-#define _SC_DEVICE_IO			_SC_DEVICE_IO
-    _SC_DEVICE_SPECIFIC,
-#define _SC_DEVICE_SPECIFIC		_SC_DEVICE_SPECIFIC
-    _SC_DEVICE_SPECIFIC_R,
-#define _SC_DEVICE_SPECIFIC_R		_SC_DEVICE_SPECIFIC_R
-    _SC_FD_MGMT,
-#define _SC_FD_MGMT			_SC_FD_MGMT
-    _SC_FIFO,
-#define _SC_FIFO			_SC_FIFO
-    _SC_PIPE,
-#define _SC_PIPE			_SC_PIPE
-    _SC_FILE_ATTRIBUTES,
-#define _SC_FILE_ATTRIBUTES		_SC_FILE_ATTRIBUTES
-    _SC_FILE_LOCKING,
-#define _SC_FILE_LOCKING		_SC_FILE_LOCKING
-    _SC_FILE_SYSTEM,
-#define _SC_FILE_SYSTEM			_SC_FILE_SYSTEM
-    _SC_MONOTONIC_CLOCK,
-#define _SC_MONOTONIC_CLOCK		_SC_MONOTONIC_CLOCK
-    _SC_MULTI_PROCESS,
-#define _SC_MULTI_PROCESS		_SC_MULTI_PROCESS
-    _SC_SINGLE_PROCESS,
-#define _SC_SINGLE_PROCESS		_SC_SINGLE_PROCESS
-    _SC_NETWORKING,
-#define _SC_NETWORKING			_SC_NETWORKING
-    _SC_READER_WRITER_LOCKS,
-#define _SC_READER_WRITER_LOCKS		_SC_READER_WRITER_LOCKS
-    _SC_SPIN_LOCKS,
-#define _SC_SPIN_LOCKS			_SC_SPIN_LOCKS
-    _SC_REGEXP,
-#define _SC_REGEXP			_SC_REGEXP
-    _SC_REGEX_VERSION,
-#define _SC_REGEX_VERSION		_SC_REGEX_VERSION
-    _SC_SHELL,
-#define _SC_SHELL			_SC_SHELL
-    _SC_SIGNALS,
-#define _SC_SIGNALS			_SC_SIGNALS
-    _SC_SPAWN,
-#define _SC_SPAWN			_SC_SPAWN
-    _SC_SPORADIC_SERVER,
-#define _SC_SPORADIC_SERVER		_SC_SPORADIC_SERVER
-    _SC_THREAD_SPORADIC_SERVER,
-#define _SC_THREAD_SPORADIC_SERVER	_SC_THREAD_SPORADIC_SERVER
-    _SC_SYSTEM_DATABASE,
-#define _SC_SYSTEM_DATABASE		_SC_SYSTEM_DATABASE
-    _SC_SYSTEM_DATABASE_R,
-#define _SC_SYSTEM_DATABASE_R		_SC_SYSTEM_DATABASE_R
-    _SC_TIMEOUTS,
-#define _SC_TIMEOUTS			_SC_TIMEOUTS
-    _SC_TYPED_MEMORY_OBJECTS,
-#define _SC_TYPED_MEMORY_OBJECTS	_SC_TYPED_MEMORY_OBJECTS
-    _SC_USER_GROUPS,
-#define _SC_USER_GROUPS			_SC_USER_GROUPS
-    _SC_USER_GROUPS_R,
-#define _SC_USER_GROUPS_R		_SC_USER_GROUPS_R
-    _SC_2_PBS,
-#define _SC_2_PBS			_SC_2_PBS
-    _SC_2_PBS_ACCOUNTING,
-#define _SC_2_PBS_ACCOUNTING		_SC_2_PBS_ACCOUNTING
-    _SC_2_PBS_LOCATE,
-#define _SC_2_PBS_LOCATE		_SC_2_PBS_LOCATE
-    _SC_2_PBS_MESSAGE,
-#define _SC_2_PBS_MESSAGE		_SC_2_PBS_MESSAGE
-    _SC_2_PBS_TRACK,
-#define _SC_2_PBS_TRACK			_SC_2_PBS_TRACK
-    _SC_SYMLOOP_MAX,
-#define _SC_SYMLOOP_MAX			_SC_SYMLOOP_MAX
-    _SC_STREAMS,
-#define _SC_STREAMS			_SC_STREAMS
-    _SC_2_PBS_CHECKPOINT,
-#define _SC_2_PBS_CHECKPOINT		_SC_2_PBS_CHECKPOINT
-
-    _SC_V6_ILP32_OFF32,
-#define _SC_V6_ILP32_OFF32		_SC_V6_ILP32_OFF32
-    _SC_V6_ILP32_OFFBIG,
-#define _SC_V6_ILP32_OFFBIG		_SC_V6_ILP32_OFFBIG
-    _SC_V6_LP64_OFF64,
-#define _SC_V6_LP64_OFF64		_SC_V6_LP64_OFF64
-    _SC_V6_LPBIG_OFFBIG,
-#define _SC_V6_LPBIG_OFFBIG		_SC_V6_LPBIG_OFFBIG
-
-    _SC_HOST_NAME_MAX,
-#define _SC_HOST_NAME_MAX		_SC_HOST_NAME_MAX
-    _SC_TRACE,
-#define _SC_TRACE			_SC_TRACE
-    _SC_TRACE_EVENT_FILTER,
-#define _SC_TRACE_EVENT_FILTER		_SC_TRACE_EVENT_FILTER
-    _SC_TRACE_INHERIT,
-#define _SC_TRACE_INHERIT		_SC_TRACE_INHERIT
-    _SC_TRACE_LOG,
-#define _SC_TRACE_LOG			_SC_TRACE_LOG
-
-    _SC_LEVEL1_ICACHE_SIZE,
-#define _SC_LEVEL1_ICACHE_SIZE		_SC_LEVEL1_ICACHE_SIZE
-    _SC_LEVEL1_ICACHE_ASSOC,
-#define _SC_LEVEL1_ICACHE_ASSOC		_SC_LEVEL1_ICACHE_ASSOC
-    _SC_LEVEL1_ICACHE_LINESIZE,
-#define _SC_LEVEL1_ICACHE_LINESIZE	_SC_LEVEL1_ICACHE_LINESIZE
-    _SC_LEVEL1_DCACHE_SIZE,
-#define _SC_LEVEL1_DCACHE_SIZE		_SC_LEVEL1_DCACHE_SIZE
-    _SC_LEVEL1_DCACHE_ASSOC,
-#define _SC_LEVEL1_DCACHE_ASSOC		_SC_LEVEL1_DCACHE_ASSOC
-    _SC_LEVEL1_DCACHE_LINESIZE,
-#define _SC_LEVEL1_DCACHE_LINESIZE	_SC_LEVEL1_DCACHE_LINESIZE
-    _SC_LEVEL2_CACHE_SIZE,
-#define _SC_LEVEL2_CACHE_SIZE		_SC_LEVEL2_CACHE_SIZE
-    _SC_LEVEL2_CACHE_ASSOC,
-#define _SC_LEVEL2_CACHE_ASSOC		_SC_LEVEL2_CACHE_ASSOC
-    _SC_LEVEL2_CACHE_LINESIZE,
-#define _SC_LEVEL2_CACHE_LINESIZE	_SC_LEVEL2_CACHE_LINESIZE
-    _SC_LEVEL3_CACHE_SIZE,
-#define _SC_LEVEL3_CACHE_SIZE		_SC_LEVEL3_CACHE_SIZE
-    _SC_LEVEL3_CACHE_ASSOC,
-#define _SC_LEVEL3_CACHE_ASSOC		_SC_LEVEL3_CACHE_ASSOC
-    _SC_LEVEL3_CACHE_LINESIZE,
-#define _SC_LEVEL3_CACHE_LINESIZE	_SC_LEVEL3_CACHE_LINESIZE
-    _SC_LEVEL4_CACHE_SIZE,
-#define _SC_LEVEL4_CACHE_SIZE		_SC_LEVEL4_CACHE_SIZE
-    _SC_LEVEL4_CACHE_ASSOC,
-#define _SC_LEVEL4_CACHE_ASSOC		_SC_LEVEL4_CACHE_ASSOC
-    _SC_LEVEL4_CACHE_LINESIZE,
-#define _SC_LEVEL4_CACHE_LINESIZE	_SC_LEVEL4_CACHE_LINESIZE
-    /* Leave room here, maybe we need a few more cache levels some day.  */
-
-    _SC_IPV6 = _SC_LEVEL1_ICACHE_SIZE + 50,
-#define _SC_IPV6			_SC_IPV6
-    _SC_RAW_SOCKETS,
-#define _SC_RAW_SOCKETS			_SC_RAW_SOCKETS
-
-    _SC_V7_ILP32_OFF32,
-#define _SC_V7_ILP32_OFF32		_SC_V7_ILP32_OFF32
-    _SC_V7_ILP32_OFFBIG,
-#define _SC_V7_ILP32_OFFBIG		_SC_V7_ILP32_OFFBIG
-    _SC_V7_LP64_OFF64,
-#define _SC_V7_LP64_OFF64		_SC_V7_LP64_OFF64
-    _SC_V7_LPBIG_OFFBIG,
-#define _SC_V7_LPBIG_OFFBIG		_SC_V7_LPBIG_OFFBIG
-
-    _SC_SS_REPL_MAX,
-#define _SC_SS_REPL_MAX			_SC_SS_REPL_MAX
-
-    _SC_TRACE_EVENT_NAME_MAX,
-#define _SC_TRACE_EVENT_NAME_MAX	_SC_TRACE_EVENT_NAME_MAX
-    _SC_TRACE_NAME_MAX,
-#define _SC_TRACE_NAME_MAX		_SC_TRACE_NAME_MAX
-    _SC_TRACE_SYS_MAX,
-#define _SC_TRACE_SYS_MAX		_SC_TRACE_SYS_MAX
-    _SC_TRACE_USER_EVENT_MAX,
-#define _SC_TRACE_USER_EVENT_MAX	_SC_TRACE_USER_EVENT_MAX
-
-    _SC_XOPEN_STREAMS,
-#define _SC_XOPEN_STREAMS		_SC_XOPEN_STREAMS
-
-    _SC_THREAD_ROBUST_PRIO_INHERIT,
-#define _SC_THREAD_ROBUST_PRIO_INHERIT	_SC_THREAD_ROBUST_PRIO_INHERIT
-    _SC_THREAD_ROBUST_PRIO_PROTECT
-#define _SC_THREAD_ROBUST_PRIO_PROTECT	_SC_THREAD_ROBUST_PRIO_PROTECT
-  };
-
-/* Values for the NAME argument to `confstr'.  */
-enum
-  {
-    _CS_PATH,			/* The default search path.  */
-#define _CS_PATH		_CS_PATH
-
-    _CS_V6_WIDTH_RESTRICTED_ENVS,
-#define _CS_V6_WIDTH_RESTRICTED_ENVS	_CS_V6_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	_CS_V6_WIDTH_RESTRICTED_ENVS
-
-    _CS_GNU_LIBC_VERSION,
-#define _CS_GNU_LIBC_VERSION	_CS_GNU_LIBC_VERSION
-    _CS_GNU_LIBPTHREAD_VERSION,
-#define _CS_GNU_LIBPTHREAD_VERSION	_CS_GNU_LIBPTHREAD_VERSION
-
-    _CS_V5_WIDTH_RESTRICTED_ENVS,
-#define _CS_V5_WIDTH_RESTRICTED_ENVS	_CS_V5_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS	_CS_V5_WIDTH_RESTRICTED_ENVS
-
-    _CS_V7_WIDTH_RESTRICTED_ENVS,
-#define _CS_V7_WIDTH_RESTRICTED_ENVS	_CS_V7_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS	_CS_V7_WIDTH_RESTRICTED_ENVS
-
-    _CS_LFS_CFLAGS = 1000,
-#define _CS_LFS_CFLAGS	_CS_LFS_CFLAGS
-    _CS_LFS_LDFLAGS,
-#define _CS_LFS_LDFLAGS	_CS_LFS_LDFLAGS
-    _CS_LFS_LIBS,
-#define _CS_LFS_LIBS		_CS_LFS_LIBS
-    _CS_LFS_LINTFLAGS,
-#define _CS_LFS_LINTFLAGS	_CS_LFS_LINTFLAGS
-    _CS_LFS64_CFLAGS,
-#define _CS_LFS64_CFLAGS	_CS_LFS64_CFLAGS
-    _CS_LFS64_LDFLAGS,
-#define _CS_LFS64_LDFLAGS	_CS_LFS64_LDFLAGS
-    _CS_LFS64_LIBS,
-#define _CS_LFS64_LIBS	_CS_LFS64_LIBS
-    _CS_LFS64_LINTFLAGS,
-#define _CS_LFS64_LINTFLAGS	_CS_LFS64_LINTFLAGS
-
-    _CS_XBS5_ILP32_OFF32_CFLAGS = 1100,
-#define _CS_XBS5_ILP32_OFF32_CFLAGS _CS_XBS5_ILP32_OFF32_CFLAGS
-    _CS_XBS5_ILP32_OFF32_LDFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LDFLAGS _CS_XBS5_ILP32_OFF32_LDFLAGS
-    _CS_XBS5_ILP32_OFF32_LIBS,
-#define _CS_XBS5_ILP32_OFF32_LIBS _CS_XBS5_ILP32_OFF32_LIBS
-    _CS_XBS5_ILP32_OFF32_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LINTFLAGS _CS_XBS5_ILP32_OFF32_LINTFLAGS
-    _CS_XBS5_ILP32_OFFBIG_CFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_CFLAGS _CS_XBS5_ILP32_OFFBIG_CFLAGS
-    _CS_XBS5_ILP32_OFFBIG_LDFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LDFLAGS _CS_XBS5_ILP32_OFFBIG_LDFLAGS
-    _CS_XBS5_ILP32_OFFBIG_LIBS,
-#define _CS_XBS5_ILP32_OFFBIG_LIBS _CS_XBS5_ILP32_OFFBIG_LIBS
-    _CS_XBS5_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LINTFLAGS _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
-    _CS_XBS5_LP64_OFF64_CFLAGS,
-#define _CS_XBS5_LP64_OFF64_CFLAGS _CS_XBS5_LP64_OFF64_CFLAGS
-    _CS_XBS5_LP64_OFF64_LDFLAGS,
-#define _CS_XBS5_LP64_OFF64_LDFLAGS _CS_XBS5_LP64_OFF64_LDFLAGS
-    _CS_XBS5_LP64_OFF64_LIBS,
-#define _CS_XBS5_LP64_OFF64_LIBS _CS_XBS5_LP64_OFF64_LIBS
-    _CS_XBS5_LP64_OFF64_LINTFLAGS,
-#define _CS_XBS5_LP64_OFF64_LINTFLAGS _CS_XBS5_LP64_OFF64_LINTFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_CFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_CFLAGS _CS_XBS5_LPBIG_OFFBIG_CFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LDFLAGS _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_LIBS,
-#define _CS_XBS5_LPBIG_OFFBIG_LIBS _CS_XBS5_LPBIG_OFFBIG_LIBS
-    _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_POSIX_V6_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS _CS_POSIX_V6_ILP32_OFF32_CFLAGS
-    _CS_POSIX_V6_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS _CS_POSIX_V6_ILP32_OFF32_LDFLAGS
-    _CS_POSIX_V6_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V6_ILP32_OFF32_LIBS _CS_POSIX_V6_ILP32_OFF32_LIBS
-    _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS _CS_POSIX_V6_ILP32_OFFBIG_LIBS
-    _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS
-    _CS_POSIX_V6_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_CFLAGS _CS_POSIX_V6_LP64_OFF64_CFLAGS
-    _CS_POSIX_V6_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS _CS_POSIX_V6_LP64_OFF64_LDFLAGS
-    _CS_POSIX_V6_LP64_OFF64_LIBS,
-#define _CS_POSIX_V6_LP64_OFF64_LIBS _CS_POSIX_V6_LP64_OFF64_LIBS
-    _CS_POSIX_V6_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LINTFLAGS _CS_POSIX_V6_LP64_OFF64_LINTFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_POSIX_V7_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_CFLAGS _CS_POSIX_V7_ILP32_OFF32_CFLAGS
-    _CS_POSIX_V7_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LDFLAGS _CS_POSIX_V7_ILP32_OFF32_LDFLAGS
-    _CS_POSIX_V7_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V7_ILP32_OFF32_LIBS _CS_POSIX_V7_ILP32_OFF32_LIBS
-    _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LIBS _CS_POSIX_V7_ILP32_OFFBIG_LIBS
-    _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS
-    _CS_POSIX_V7_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_CFLAGS _CS_POSIX_V7_LP64_OFF64_CFLAGS
-    _CS_POSIX_V7_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LDFLAGS _CS_POSIX_V7_LP64_OFF64_LDFLAGS
-    _CS_POSIX_V7_LP64_OFF64_LIBS,
-#define _CS_POSIX_V7_LP64_OFF64_LIBS _CS_POSIX_V7_LP64_OFF64_LIBS
-    _CS_POSIX_V7_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LINTFLAGS _CS_POSIX_V7_LP64_OFF64_LINTFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_V6_ENV,
-#define _CS_V6_ENV			_CS_V6_ENV
-    _CS_V7_ENV
-#define _CS_V7_ENV			_CS_V7_ENV
-  };
-
-#endif /* defined(_CONFNAME_H) */
diff --git a/srcpkgs/lshw/patches/musl-confname_h.patch b/srcpkgs/lshw/patches/musl-confname_h.patch
deleted file mode 100644
index 3d4b1f00267..00000000000
--- a/srcpkgs/lshw/patches/musl-confname_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The musl libc does not define the _sysconf(2) constant _SC_LONG_BIT,
-thus include a local copy of GNU libc's /usr/include/bits/confname.h
-
---- src/core/abi.cc	2015-10-14 10:09:57.131324977 +0200
-+++ src/core/abi.cc	2015-10-14 10:15:29.040299081 +0200
-@@ -8,6 +8,9 @@
- #include "config.h"
- #include "abi.h"
- #include "osutils.h"
-+#if !defined(__GLIBC__)
-+#include "confname.h"
-+#endif
- #include <unistd.h>
- #include <stdlib.h>
- #include <dirent.h>
diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch
new file mode 100644
index 00000000000..e67df9ddc6c
--- /dev/null
+++ b/srcpkgs/lshw/patches/musl-long_bits.patch
@@ -0,0 +1,20 @@
+sysconf(LONG_BIT) isn't correct usage of sysconf(3).
+
+musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's really
+no reason to use sysconf(3) here, word size isn't a runtime property.
+
+diff --git src/core/abi.cc src/core/abi.cc
+index adff7b5..76c664c 100644
+--- src/core/abi.cc
++++ src/core/abi.cc
+@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
+ bool scan_abi(hwNode & system)
+ {
+   // are we compiled as 32- or 64-bit process ?
+-  long sc = sysconf(LONG_BIT);
+-  if(sc==-1) sc = sysconf(_SC_LONG_BIT);
+-  if(sc!=-1) system.setWidth(sc);
++  system.setWidth(LONG_BIT);
+ 
+   pushd(PROC_SYS);
+ 
diff --git a/srcpkgs/lshw/patches/musl-path_max.patch b/srcpkgs/lshw/patches/musl-path_max.patch
deleted file mode 100644
index e10dd0c6df0..00000000000
--- a/srcpkgs/lshw/patches/musl-path_max.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Need to include limits.h for the definition of PATH_MAX.
-
---- src/core/cpufreq.cc	2015-10-14 10:07:06.646338278 +0200
-+++ src/core/cpufreq.cc	2015-10-14 10:08:09.092333406 +0200
-@@ -10,6 +10,7 @@
- #include "version.h"
- #include "hw.h"
- #include "osutils.h"
-+#include <limits.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template
index c6d0130a766..6ba1bb44a95 100644
--- a/srcpkgs/lshw/template
+++ b/srcpkgs/lshw/template
@@ -1,7 +1,7 @@
 # Template file for 'lshw'
 pkgname=lshw
 version=B.02.19.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="VERSION=${version}"
 make_build_target="all gui"
@@ -18,11 +18,6 @@ distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
 checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
 
 post_patch() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			cp -p ${FILESDIR}/confname.h ${wrksrc}/src/core
-			;;
-	esac
 	vsed -i src/Makefile src/gui/Makefile \
 		-e 's,CXXFLAGS=,CXXFLAGS += ,g'
 }

From 59774e65f2531cb193bc7eb99cc7b4e7eacc0a87 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Mon, 11 Jan 2021 16:15:59 +0100
Subject: [PATCH 562/752] qjackctl: Add build option for jack-session support

This option is necessary to make it possible to use qjackctl with
PipeWire, which doesn't support the jack session protocol.

Since this doesn't change the resulting package, it isn't revbumped.

Closes: #27828 [via git-merge-pr]
---
 srcpkgs/qjackctl/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 83743edd237..f47da62e887 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -4,6 +4,7 @@ version=0.9.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
+configure_args="$(vopt_enable jack_session jack-session)"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel qt5-devel jack-devel qt5-x11extras-devel"
 depends="desktop-file-utils hicolor-icon-theme jack"
@@ -14,6 +15,10 @@ homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=5196c5c01b7948c1a8ca37cd3198a7f0fe095a99a34a67086abd3466855b4abd
 
+build_options="jack_session"
+build_options_default="jack_session"
+desc_option_jack_session="Enable support for the deprecated Jack Session API"
+
 if [ "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel qt5-x11extras-devel"
 	configure_args+=" ac_cv_path_ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake"

From 71a693c5162512df3209f44ac4316e6c9d687327 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 11 Jan 2021 10:26:54 +1100
Subject: [PATCH 563/752] upmpdcli: update to 1.5.8

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

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 99eb988d948..2107b090313 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.7
+version=1.5.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=37ccd3bf24641eab979fa6bb143554384e24f954bcbd98488ce7334235dab0e3
+checksum=802a2ab795841fbb9bfff5fd7951881022f5414ed893a1db704801b999e658a8
 python_version=3
 
 system_accounts="_upmpdcli"

From 03c3965a27e9db57bf48ea3fcabc1cf367712fdf Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Jan 2021 19:55:23 +0100
Subject: [PATCH 564/752] lzip: update to 1.22

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

diff --git a/srcpkgs/lzip/template b/srcpkgs/lzip/template
index bc130ffc4d2..288a8163fae 100644
--- a/srcpkgs/lzip/template
+++ b/srcpkgs/lzip/template
@@ -1,14 +1,14 @@
 # Template file for 'lzip'
 pkgname=lzip
-version=1.21
+version=1.22
 revision=1
 build_style=gnu-configure
 short_desc="Lossless data compressor based on the LZMA algorithm"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.nongnu.org/lzip/lzip.html"
 distfiles="${NONGNU_SITE}/lzip/lzip-${version}.tar.gz"
-checksum=e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b
+checksum=c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948
 
 do_configure() {
 	./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"

From 3283eb128b23a55e866221a34e271bfef6dc7fd7 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Sun, 10 Jan 2021 16:49:08 +0100
Subject: [PATCH 565/752] task: update to 2.5.3.

Use GitHub distfile location and vcompletion helper.

Closes: #27809 [via git-merge-pr]
---
 srcpkgs/task/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/task/template b/srcpkgs/task/template
index cc7944eae2e..024553ea2ca 100644
--- a/srcpkgs/task/template
+++ b/srcpkgs/task/template
@@ -1,19 +1,19 @@
 # Template file for 'task'
 pkgname=task
-version=2.5.1
-revision=6
+version=2.5.3
+revision=1
 build_style=cmake
 makedepends="libuuid-devel gnutls-devel"
 short_desc="Task Warrior command-line todo list manager"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="https://taskwarrior.org"
-distfiles="https://taskwarrior.org/download/${pkgname}-${version}.tar.gz"
-checksum=d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15
+distfiles="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/task-${version}.tar.gz"
+checksum=7243d75e0911d9e2c9119ad94a61a87f041e4053e197f7280c42410aa1ee963b
 
 post_install() {
-	vinstall scripts/zsh/_task 644 usr/share/zsh/site-functions
-	vinstall scripts/bash/task.sh 644 usr/share/bash-completion/completions ${pkgname}
-	vinstall scripts/fish/task.fish 644 usr/share/fish/vendor_completions.d
+	vcompletion scripts/zsh/_task zsh
+	vcompletion scripts/bash/task.sh bash
+	vcompletion scripts/fish/task.fish fish
 	vlicense LICENSE
 }

From 965df083a915b4f07d7e7317b984b79754915e7f Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Sat, 9 Jan 2021 22:12:06 +0100
Subject: [PATCH 566/752] pueue: update to 0.10.2

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

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index a02bf8af489..adb0e9ea182 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -1,6 +1,6 @@
 # Template file for 'pueue'
 pkgname=pueue
-version=0.9.0
+version=0.10.2
 revision=1
 build_style=cargo
 short_desc="Command-line tool for managing long-running tasks"
@@ -8,7 +8,7 @@ maintainer="crater2150 <void@qwertyuiop.de>"
 license="MIT"
 homepage="https://github.com/Nukesor/pueue"
 distfiles="https://github.com/Nukesor/pueue/archive/v${version}.tar.gz"
-checksum=15fc17ffc931ba077bf7951f403009bd8391eec9e735b0c7297a5dfba997ebed
+checksum=dbd333079df9249609f6a01d7c96175ec9d74f9d621688b95ec755134b7fa1f5
 
 post_install() {
 	vlicense LICENSE

From d5ec2c6366c47f670d0f9f0619118727ddaa1402 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:25:28 +0200
Subject: [PATCH 567/752] zziplib: update to 0.13.72.

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

diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template
index 74c093cff52..ab5af234af6 100644
--- a/srcpkgs/zziplib/template
+++ b/srcpkgs/zziplib/template
@@ -1,6 +1,6 @@
 # Template file for 'zziplib'
 pkgname=zziplib
-version=0.13.71
+version=0.13.72
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config python3 tar zip"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later, MPL-1.1"
 homepage="https://github.com/gdraheim/zziplib"
 changelog="https://raw.githubusercontent.com/gdraheim/zziplib/master/ChangeLog"
 distfiles="https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"
-checksum=2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2
+checksum=93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DZZIPTEST=OFF"

From 95d5eecbb5dedfeb266d4f0d9c008e522459eaac Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:13:05 +0200
Subject: [PATCH 568/752] zile: update to 2.4.15.

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

diff --git a/srcpkgs/zile/template b/srcpkgs/zile/template
index a2326621e1c..e710cb6d622 100644
--- a/srcpkgs/zile/template
+++ b/srcpkgs/zile/template
@@ -1,16 +1,16 @@
 # Template file for 'zile'
 pkgname=zile
-version=2.4.14
-revision=3
+version=2.4.15
+revision=1
 build_style=gnu-configure
 hostmakedepends="help2man pkg-config"
 makedepends="acl-devel gc-devel libatomic_ops-devel ncurses-devel"
-short_desc="A small, fast, and powerful Emacs clone"
+short_desc="Small, fast, and powerful Emacs clone"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/zile"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74
+checksum=39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e
 
 post_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 4a4f82ea524b676f3380f150d1e5cdd96bf709f6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 10 Jan 2021 01:29:54 +0200
Subject: [PATCH 569/752] vitetris: update to 0.59.1.

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

diff --git a/srcpkgs/vitetris/template b/srcpkgs/vitetris/template
index 64e8df0d186..833a3cb491e 100644
--- a/srcpkgs/vitetris/template
+++ b/srcpkgs/vitetris/template
@@ -1,6 +1,6 @@
 # Template file for 'vitetris'
 pkgname=vitetris
-version=0.58.0
+version=0.59.1
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --with-ncurses --without-x"
@@ -11,7 +11,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-2-Clause"
 homepage="http://www.victornils.net/tetris/"
 distfiles="https://github.com/vicgeralds/vitetris/archive/v${version}.tar.gz"
-checksum=e7e7cb74bb814b9fec80fe4ede3c3f04134d8217d630e092a097238248d604f9
+checksum=699443df03c8d4bf2051838c1015da72039bbbdd0ab0eede891c59c840bdf58d
 
 post_install() {
 	sed -i 's/Exec=tetris/Exec=vitetris/' $DESTDIR/usr/share/applications/vitetris.desktop

From d49095bd9dfb10a37929bbd641f2a9f2fa949ee5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:03:17 +0200
Subject: [PATCH 570/752] moe: update to 1.11.

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

diff --git a/srcpkgs/moe/template b/srcpkgs/moe/template
index 58cbae94309..0b41e267582 100644
--- a/srcpkgs/moe/template
+++ b/srcpkgs/moe/template
@@ -1,6 +1,6 @@
 # Template file for 'moe'
 pkgname=moe
-version=1.10
+version=1.11
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/moe/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.lz"
-checksum=8cfd44ab5623ed4185ee53962b879fd9bdd18eab47bf5dd9bdb8271f1bf7d53b
+checksum=0efbcbcf5a4a8d966541c6cb099ba0ab6416780366dbce82d9ff995a85a5e2f9
 
 pre_configure() {
 	# remove hardcoded values

From a55626992d8eb6fdca1a54724f73898689d271f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 10:46:27 -0500
Subject: [PATCH 571/752] djmount: remove package

Upstream has not been updated since 2006-08-27.
---
 srcpkgs/djmount/INSTALL.msg                   |   1 +
 srcpkgs/djmount/patches/000_djmount.1.diff    | 105 ------------------
 .../djmount/patches/001-libupnp-1.6.6.diff    |  31 ------
 .../patches/003-support-fstab-mounting.diff   |  96 ----------------
 .../patches/djmount-0.71-includes.patch       |  10 --
 srcpkgs/djmount/patches/musl.patch            |  11 --
 srcpkgs/djmount/template                      |  16 +--
 7 files changed, 4 insertions(+), 266 deletions(-)
 create mode 100644 srcpkgs/djmount/INSTALL.msg
 delete mode 100644 srcpkgs/djmount/patches/000_djmount.1.diff
 delete mode 100644 srcpkgs/djmount/patches/001-libupnp-1.6.6.diff
 delete mode 100644 srcpkgs/djmount/patches/003-support-fstab-mounting.diff
 delete mode 100644 srcpkgs/djmount/patches/djmount-0.71-includes.patch
 delete mode 100644 srcpkgs/djmount/patches/musl.patch

diff --git a/srcpkgs/djmount/INSTALL.msg b/srcpkgs/djmount/INSTALL.msg
new file mode 100644
index 00000000000..32dd66613a6
--- /dev/null
+++ b/srcpkgs/djmount/INSTALL.msg
@@ -0,0 +1 @@
+djmount is no longer provided by Void Linux
diff --git a/srcpkgs/djmount/patches/000_djmount.1.diff b/srcpkgs/djmount/patches/000_djmount.1.diff
deleted file mode 100644
index a20589a339d..00000000000
--- a/srcpkgs/djmount/patches/000_djmount.1.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Description: Adds djmount.1 manpage which isn't included in original sources.
-# Forwarded: http://sourceforge.net/tracker/index.php?func=detail&aid=2834139&group_id=142039&atid=751320
-# Author: Dario Minnucci <midget@debian.org>
-# Last-Update: 2010-01-24
-#
---- djmount.1	1970-01-01 01:00:00.000000000 +0100
-+++ djmount.1	2009-08-31 19:38:36.289425318 +0200
-@@ -0,0 +1,96 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH DJMOUNT 1 "August 31, 2009"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+djmount \- file system client for mounting network media servers
-+.SH SYNOPSIS
-+.B djmount
-+.RI [ options ] " mountpoint"
-+.br
-+.SH DESCRIPTION
-+This manual page describes briefly the
-+.B djmount
-+command.
-+.PP
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-+.\" respectively.
-+This package provides a client for Universal Plug'n'Play (UPnP) Audio-Visual MediaServers.  It discovers all compatible UPnP AV devices on the network automatically and mounts their media content as a file system using FUSE.
-+
-+.SH OPTIONS
-+This program follows the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of options is included below.
-+For a complete description, see the Info files.
-+
-+.TP
-+.B \-d[levels]
-+enable debug output (implies \-f)
-+
-+.TP
-+.B \-f
-+foreground operation (default: daemonized)
-+
-+.TP
-+.B \-h, \-\-help
-+print this help, then exit
-+
-+.TP
-+.B \-\-version
-+print version number, then exit
-+
-+.TP
-+.B \-o [options]
-+mount options (see below)
-+
-+
-+.TP
-+Mount options (one or more comma separated options):
-+
-+ iocharset=<charset>    filenames encoding (default: from environment)
-+ playlists              use playlists for AV files, instead of plain files
-+ search_history=<size>  number of remembered searches (default: 100)
-+                        (set to 0 to disable search)
-+
-+.TP
-+See FUSE documentation for the following mount options:
-+
-+ default_permissions    enable permission checking by kernel
-+ allow_other            allow access to other users
-+ allow_root             allow access to root
-+ kernel_cache           cache files in kernel
-+ nonempty               allow mounts over non-empty file/dir
-+ fsname=NAME            set filesystem name in mtab
-+
-+
-+.TP
-+Debug levels are one or more comma separated words:
-+
-+ upnperr, upnpall: increasing level of UPnP traces
-+ error, warn, info, debug: increasing level of djmount traces
-+ fuse: activates FUSE traces
-+ leak, leakfull: enable talloc leak reports at exit
-+ '\-d' alone defaults to 'upnpall, debug, fuse, leak' which is all traces.
-+
-+
-+.SH SEE ALSO
-+.BR fusermount (1)
-+.SH AUTHOR
-+djmount was written by Rémi Turboult <r3mi@users.sourceforge.net>.
-+.PP
-+This manual page was written by Dario Minnucci <midget@debian.org>,
-+for the Debian project (and may be used by others).
diff --git a/srcpkgs/djmount/patches/001-libupnp-1.6.6.diff b/srcpkgs/djmount/patches/001-libupnp-1.6.6.diff
deleted file mode 100644
index aebc9dd22c5..00000000000
--- a/srcpkgs/djmount/patches/001-libupnp-1.6.6.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Description: Update libupnp API for 1.6.x.
-#   Between libupnp2 and libupnp3 (pupnp 1.4.x and 1.6.x) the function
-#   SetLogFileNames was renamed to UpnpSetLogFileNames.
-# Author: nick@leverton.org
-# Bug-Debian: 581879 
-#
---- djmount/fuse_main.c	2010-05-16 21:40:56.000000000 +0100
-+++ djmount/fuse_main.c	2010-05-16 21:43:55.000000000 +0100
-@@ -616,7 +616,7 @@
- 	}  
- 	Log_Colorize (true);
- #if UPNP_HAVE_DEBUG
--	SetLogFileNames ("/dev/null", "/dev/null");
-+	UpnpSetLogFileNames ("/dev/null", "/dev/null");
- #endif
- 	
- 	/*
-@@ -710,10 +710,10 @@
- 					Log_SetMaxLevel (LOG_ERROR);
- #if UPNP_HAVE_DEBUG
- 				} else if (strcmp (s, "upnperr") == 0) {
--					SetLogFileNames ("/dev/stdout", 
-+					UpnpSetLogFileNames ("/dev/stdout",
- 							 "/dev/null");
- 				} else if (strcmp (s, "upnpall") == 0) {
--					SetLogFileNames ("/dev/stdout", 
-+					UpnpSetLogFileNames ("/dev/stdout",
- 							 "/dev/stdout");
- #endif
- 				} else {
diff --git a/srcpkgs/djmount/patches/003-support-fstab-mounting.diff b/srcpkgs/djmount/patches/003-support-fstab-mounting.diff
deleted file mode 100644
index 05a1e6f8539..00000000000
--- a/srcpkgs/djmount/patches/003-support-fstab-mounting.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: Support /etc/fstab mounting
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3514280&group_id=142039&atid=751317
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660098
-Author: Kevin Vargo <vargok@yahoo.com>
-Last-Update: 2012-04-02
---- djmount/fuse_main.c	2006-08-27 16:12:20.000000000 -0400
-+++ djmount/fuse_main.c	2011-12-23 15:39:29.000000000 -0500
-@@ -529,6 +529,7 @@
-      "    --version              print version number, then exit\n"
-      "    -o [options]           mount options (see below)\n"
-      "    -d[levels]             enable debug output (implies -f)\n"
-+     "    -s                     sloppy -- ignore unknown options\n"
-      "    -f                     foreground operation (default: daemonized)\n"
-      "\n"
-      "Mount options (one or more comma separated options) :\n"
-@@ -538,6 +539,7 @@
-      "    playlists              use playlists for AV files, instead of plain files\n"
-      "    search_history=<size>  number of remembered searches (default: %d)\n"
-      "                           (set to 0 to disable search)\n"
-+     "    sloppy                 ignore unknown options (e.g., for /etc/fstab)\n"
-      "\n", DEFAULT_SEARCH_HISTORY_SIZE);
-   fprintf 
-     (stream,
-@@ -635,6 +637,9 @@
- 	Log_Printf (LOG_DEBUG, "  Fuse option = %s", fuse_argv[fuse_argc]); \
- 	fuse_argc++
- 
-+	//Ignore unknown options "sloppy" -- mount -s
-+	bool options_sloppy = false;
-+
- 	int opt = 1;
- 	char* o;
- 	while ((o = argv[opt++])) {
-@@ -646,6 +651,9 @@
- 			
- 		} else if (strcmp(o, "-f") == 0) {
- 			background = false;
-+			
-+		} else if (strcmp(o, "-s") == 0) {
-+			options_sloppy = true;
- 
- 		} else if (*o != '-') { 
- 			// mount point
-@@ -657,6 +665,10 @@
- 			char* options_copy = strdup (options);
- 			char* tokptr = 0;
- 			char* s;
-+
-+			char** unknown_options = talloc_size(tmp_ctx, sizeof(char) * strlen(options_copy));
-+			int unknown_ptr = -1;
-+
- 			for (s = strtok_r (options_copy, ",", &tokptr); 
- 			     s != NULL; 
- 			     s = strtok_r (NULL, ",", &tokptr)) {
-@@ -669,16 +681,39 @@
- 				} else if (strncmp(s, "search_history=", 15)
- 					   == 0) {
- 					search_history_size = atoi (s+15);
-+				//check for '-s|-o sloppy' -- ignore unknown options
-+				} else if (strncmp(s, "sloppy", 15) == 0 ||
-+						(strlen(s) == 1 && strncmp(s, "s", 1) == 0)) {
-+					options_sloppy = true;
- 				} else if (strncmp(s, "fsname=", 7) == 0 ||
- 					   strstr (FUSE_ALLOWED_OPTIONS, s)) {
- 					FUSE_ARG ("-o");
- 					FUSE_ARG (talloc_strdup (tmp_ctx, s));
- 				} else {
-+					//Record unknown options for analysis, after we're sure
-+					//we don't see '-o sloppy'
-+					unknown_options[++unknown_ptr] = strdup(s);
-+				}
-+			}
-+
-+			//Now, we should know if we have invalid option(s), or can
-+			//ignore:
-+			if (unknown_ptr >= 0) {
-+				//If debug...
-+				int i = 0;
-+				for (i = 0; i <= unknown_ptr; i++) {
-+					Log_Printf (LOG_WARNING, "Found unknown option = %s%s",
-+						unknown_options[i], (options_sloppy ? "; ignoring" : ""));
-+				}
-+				//If 'sloppy' is not enabled...
-+				if (! options_sloppy) {
- 					bad_usage (argv[0], 
--						   "unknown mount option '%s'",
--						   s); // ---------->
-+						   "unknown mount option '%s' (and [-s|-o sloppy] not provided)",
-+						   unknown_options[0]); // ---------->
- 				}
- 			}
-+			talloc_free(unknown_options);
-+
- 			free (options_copy);
- 			Log_Printf (LOG_INFO, "  Mount options = %s", options);
- 			
diff --git a/srcpkgs/djmount/patches/djmount-0.71-includes.patch b/srcpkgs/djmount/patches/djmount-0.71-includes.patch
deleted file mode 100644
index 36cf3be000c..00000000000
--- a/srcpkgs/djmount/patches/djmount-0.71-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- djmount/upnp_util.c.jx	2006-08-27 16:12:20.000000000 -0400
-+++ djmount/upnp_util.c	2011-05-31 12:30:42.980161484 -0400
-@@ -28,6 +28,7 @@
- #	include <config.h>
- #endif
- 
-+#include "upnp.h"
- #include "upnp_util.h"
- #include "log.h"
- #include "xml_util.h"
diff --git a/srcpkgs/djmount/patches/musl.patch b/srcpkgs/djmount/patches/musl.patch
deleted file mode 100644
index 14084beebea..00000000000
--- a/srcpkgs/djmount/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- djmount/cache.h.orig	2016-04-25 08:49:55.265766330 +0200
-+++ djmount/cache.h	2016-04-25 08:50:06.728886696 +0200
-@@ -25,7 +25,7 @@
- 
- #include <stdlib.h>
- #include <stdbool.h>
--
-+#include <sys/time.h>
- 
- /******************************************************************************
-  * @var Cache
diff --git a/srcpkgs/djmount/template b/srcpkgs/djmount/template
index b0ef3b59c33..bd3ff5733a9 100644
--- a/srcpkgs/djmount/template
+++ b/srcpkgs/djmount/template
@@ -1,19 +1,9 @@
 # Template file for 'djmount'
 pkgname=djmount
 version=0.71
-revision=7
-build_style=gnu-configure
-configure_args="--with-external-libupnp --with-external-talloc"
-hostmakedepends="pkg-config"
-makedepends="fuse-devel talloc-devel libupnp-devel readline-devel"
-short_desc="Mount MediaServers content as a Linux file system"
+revision=8
+build_style=meta
+short_desc="Mount MediaServers content as a Linux file system (removed package)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://djmount.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=aa5bb482af4cbd42695a7e396043d47b53d075ac2f6aa18a8f8e11383c030e4f
-
-do_install() {
-	vbin djmount/djmount
-	vman djmount.1
-}

From fd75b417c0b202cfb7595d42609524b7ef402984 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 11:47:03 -0500
Subject: [PATCH 572/752] retroshare: build against miniupnpc

---
 srcpkgs/retroshare/template | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 4931444905a..8b92dd990f1 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,12 +1,14 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=3
+revision=4
 wrksrc="RetroShare-${version}"
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake"
+configure_args="RS_UPNP_LIB=miniupnpc"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools
+ qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel"
 makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
- libopencv-devel libssh-devel libupnp-devel libXScrnSaver-devel libxslt-devel
+ libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
  pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
  speex-devel sqlcipher-devel sqlite-devel rapidjson"
 short_desc="Decentralized, private and secure commmunication and sharing platform"
@@ -16,5 +18,13 @@ homepage="https://retroshare.cc"
 distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz"
 checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5
 
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/375096223#L1160
- https://travis-ci.org/voidlinux/void-packages/jobs/375096224#L1668"
+post_patch() {
+	# upnputil.c includes a C++ header, so make sure qmake recognizes it as C++
+	mv libretroshare/src/upnp/upnputil.{c,cc}
+	vsed -i libretroshare/src/libretroshare.pro \
+		-e 's,\bupnp/upnputil.c\b,upnp/upnputil.cc,'
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 5490663413b6a13b43bdf5c430046a5b1052de7f Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:35:15 +0100
Subject: [PATCH 573/752] libupnp: update to 1.14.0.

Closes #27829.
---
 common/shlibs            |  4 ++--
 srcpkgs/libupnp/template | 13 ++++++++-----
 srcpkgs/libupnp/update   |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 srcpkgs/libupnp/update

diff --git a/common/shlibs b/common/shlibs
index 3a329c443a6..1c04cc78885 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1452,8 +1452,8 @@ libedit.so.0 libedit-20130712.3.1_1
 libnet.so.9 libnet-1.2_1
 libgpaste.so.13 libgpaste-3.38.2_1
 libthreadutil.so.6 libupnp-1.6.18_1
-libixml.so.2 libupnp-1.6.18_1
-libupnp.so.6 libupnp-1.6.18_1
+libupnp.so.17 libupnp-1.14.0_1
+libixml.so.11 libupnp-1.14.0_1
 libupnpp.so.9 libupnpp-0.18.0_1
 libgeocode-glib.so.0 geocode-glib-3.10.0_1
 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index fc06f05c442..9adb5f00da6 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,18 +1,20 @@
 # Template file for 'libupnp'
 pkgname=libupnp
-version=1.6.25
+version=1.14.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool"
-short_desc="A Portable Open Source UPnP Development Kit"
+hostmakedepends="automake libtool pkg-config"
+short_desc="Portable Open Source UPnP Development Kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://pupnp.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2"
-checksum=c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43
+checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+
+CFLAGS="-D_FILE_OFFSET_BITS=64"
 
 post_install() {
-	vlicense LICENSE
+	vlicense COPYING
 }
 
 pre_configure() {
@@ -21,6 +23,7 @@ pre_configure() {
 
 libupnp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="libupnp1.8-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libupnp/update b/srcpkgs/libupnp/update
deleted file mode 100644
index f9e26f0c7e3..00000000000
--- a/srcpkgs/libupnp/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="1.8*"

From f716b268f081d0a6406979654f9e47122914bd5e Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 11 Jan 2021 16:37:12 +0100
Subject: [PATCH 574/752] gerbera: update to 1.6.4

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

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index cdec13159fd..0c2cae408e1 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,17 +1,19 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.3.1
-revision=2
+version=1.6.4
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
- libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel"
+ libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
+checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From f752ae98016540214dd549fa29c6c1c3fd65f1ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:12:23 -0500
Subject: [PATCH 575/752] mpd: rebuild against new libupnp

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 8ce4f1799a7..42e12041856 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.22.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -21,7 +21,7 @@ hostmakedepends="pkg-config python3-Sphinx"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
- libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel
+ libsoup-devel libupnp-devel mpg123-devel opus-devel yajl-devel
  zziplib-devel libsoxr-devel audiofile-devel twolame-devel
  $(vopt_if io_uring 'liburing-devel')
  $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel')

From 107be2d66f1ed2a8a81bd4d66311ae5f1d166646 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:12:23 -0500
Subject: [PATCH 576/752] vlc: rebuild against new libupnp

---
 srcpkgs/vlc/template | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 9d9a8765429..7cb0b4a3c1d 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.11.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -30,7 +30,7 @@ makedepends="
  libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel
  libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel
  libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel
- libSM-devel libsysfs-devel libtheora-devel libupnp1.8-devel
+ libSM-devel libsysfs-devel libtheora-devel libupnp-devel
  libXinerama-devel libXpm-devel libXvMC-devel opus-devel pulseaudio-devel
  sndio-devel speex-devel taglib-devel wayland-protocols x264-devel
  xcb-util-devel xcb-util-keysyms-devel live555-devel libdvdread-devel
@@ -44,7 +44,7 @@ makedepends="
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
 
 # Package build options
-build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio chromecast"
+build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
 build_options_default="lua smb v4l2 x265 sndio chromecast"
 
 CFLAGS="-fcommon"
@@ -60,15 +60,9 @@ case "$XBPS_TARGET_MACHINE" in
 		configure_args+=" --disable-altivec"
 		build_options_default+=" opengl"
 		;;
-	armv[67]l*)
+	armv[67]*)
 		# XXX only for rpi
-		configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
-		makedepends+=" rpi-userland-devel"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
-		LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
+		build_options_default+=" rpi"
 		;;
 esac
 
@@ -76,6 +70,18 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" qt"
 fi
 
+if [ "$build_option_rpi" ]; then
+	configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
+	makedepends+=" rpi-userland-devel"
+
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
+
+	LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
+fi
+
 pre_configure() {
 	NOCONFIGURE=1 ./bootstrap
 

From 5a8b13d8c796b2920ab438ec2b5f1e9cd56c657f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:14:16 -0500
Subject: [PATCH 577/752] libupnp1.8: remove package

---
 common/shlibs               |  2 --
 srcpkgs/libupnp1.8-devel    |  1 -
 srcpkgs/libupnp1.8/template | 36 ------------------------------------
 srcpkgs/libupnp1.8/update   |  1 -
 4 files changed, 40 deletions(-)
 delete mode 120000 srcpkgs/libupnp1.8-devel
 delete mode 100644 srcpkgs/libupnp1.8/template
 delete mode 100644 srcpkgs/libupnp1.8/update

diff --git a/common/shlibs b/common/shlibs
index 1c04cc78885..8f8117a371e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3142,8 +3142,6 @@ libgutenprint.so.9 gutenprint-5.3.3_1
 libunbound.so.8 libunbound-1.10.0_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
-libixml.so.10 libupnp1.8-1.8.2_1
-libupnp.so.13 libupnp1.8-1.8.4_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libmozjs-52.so mozjs52-52.3.0_1
diff --git a/srcpkgs/libupnp1.8-devel b/srcpkgs/libupnp1.8-devel
deleted file mode 120000
index e90a1eae9ec..00000000000
--- a/srcpkgs/libupnp1.8-devel
+++ /dev/null
@@ -1 +0,0 @@
-libupnp1.8
\ No newline at end of file
diff --git a/srcpkgs/libupnp1.8/template b/srcpkgs/libupnp1.8/template
deleted file mode 100644
index 7ae8ba2f1d4..00000000000
--- a/srcpkgs/libupnp1.8/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'libupnp1.8'
-pkgname=libupnp1.8
-version=1.8.7
-revision=1
-wrksrc="pupnp-release-${version}"
-build_style=gnu-configure
-configure_args="--enable-ipv6 --enable-reuseaddr"
-hostmakedepends="automake libtool pkg-config"
-short_desc="Portable Open Source UPnP Development Kit"
-maintainer="Alexander Gehrke <void@qwertyuiop.de>"
-license="BSD-3-Clause"
-homepage="http://pupnp.sourceforge.net/"
-distfiles="https://github.com/mrjimenez/pupnp/archive/release-${version}.tar.gz"
-checksum=236a788a0fe1274f51497c0433398ab2fd8ecf3ed8a6e738b15896f63e89c81d
-
-# libupnp uses large file support, so users must do that, too
-CFLAGS="-D_FILE_OFFSET_BITS=64"
-
-pre_configure() {
-	autoreconf -fi
-}
-
-post_install() {
-	vlicense COPYING
-}
-
-libupnp1.8-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
-	}
-}
diff --git a/srcpkgs/libupnp1.8/update b/srcpkgs/libupnp1.8/update
deleted file mode 100644
index 35ccc57c5ec..00000000000
--- a/srcpkgs/libupnp1.8/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="release-\K[\d\.]*(?=\.tar.gz)"

From 0e1d8bd479a70a65bef114a1895297a93aa7c62a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:15:58 -0500
Subject: [PATCH 578/752] hyperion: unify rpi build options, fix linker paths

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

diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template
index 3f7952a187d..eac663a6bb3 100644
--- a/srcpkgs/hyperion/template
+++ b/srcpkgs/hyperion/template
@@ -6,9 +6,10 @@ build_style=cmake
 configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON
  -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON
  -DENABLE_X11=ON -DENABLE_SPIDEV=ON -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
- $(vopt_if dispmanx -DENABLE_DISPMANX=ON -DENABLE_FB=ON)"
+ $(vopt_if rpi -DENABLE_DISPMANX=ON -DENABLE_FB=ON)"
 hostmakedepends="protobuf qt5-host-tools qt5-qmake"
-makedepends="libusb-devel protobuf-devel python3-devel qt5-devel $(vopt_if dispmanx rpi-userland-devel)"
+makedepends="libusb-devel protobuf-devel python3-devel qt5-devel
+ $(vopt_if rpi rpi-userland-devel)"
 short_desc="Ambient Lighting Software"
 maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="MIT"
@@ -17,8 +18,11 @@ distfiles="https://github.com/hyperion-project/hyperion/archive/${version}.tar.g
 checksum=aa2e226f1fe035166379eefef00bf389b36da514739fa24a3608b2ef44fc7b18
 conf_files="/etc/hyperion/hyperion.config.json"
 
-build_options="dispmanx"
-desc_option_dispmanx="Enable the RPI dispmanx grabber (disables FB grabber)"
+build_options="rpi"
+
+if [ "$build_option_rpi" ]; then
+	LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib"
+fi
 
 post_install() {
 	vinstall config/hyperion.config.json.example 0644 etc/hyperion hyperion.config.json

From f9a952c96d26d1abcf0ea866da5401140e142fc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:16:45 -0500
Subject: [PATCH 579/752] libcec: unify rpi build options, fix linker paths

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

diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index a21293587d5..bf232fb89eb 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -21,6 +21,7 @@ if [ "$build_option_rpi" ]; then
 	configure_args+=" -DRPI_INCLUDE_DIR=${XBPS_CROSS_BASE}/opt/vc/include"
 	configure_args+=" -DRPI_LIB_DIR=${XBPS_CROSS_BASE}/opt/vc/lib"
 	makedepends+=" rpi-userland-devel"
+	LDFLAGS="-Wl,-rpath=/opt/vc/lib"
 fi
 
 post_install() {

From d023bc5e8cc4ef9178f41aba233162bd25d1c131 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:18:08 -0500
Subject: [PATCH 580/752] gst-omx: unify rpi build options, fix linker paths

---
 srcpkgs/gst-omx/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index a4d2fad7609..2a77a4a8e27 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,9 +1,10 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
 version=1.16.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-examples"
+configure_args="--disable-examples
+ $(vopt_if rpi --with-omx-target=rpi --with-omx-target=generic)"
 hostmakedepends="pkg-config python glib-devel"
 makedepends="gst-plugins-base1-devel"
 short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
@@ -13,15 +14,15 @@ homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439
 
+build_options="rpi"
+
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|aarch64*|ppc*)
-		# XXX bellagio target
-		configure_args+=" --with-omx-target=generic"
-		;;
-	armv[67]*)
-		configure_args+=" --with-omx-target=rpi"
-		makedepends+=" rpi-firmware rpi-userland-devel"
-		export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
-		CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
-		;;
+	armv[67]*) build_options_default="rpi" ;;
 esac
+
+if [ "$build_option_rpi" ]; then
+	makedepends+=" rpi-firmware rpi-userland-devel"
+	export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
+	CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
+	LDFLAGS="-Wl,-rpath=/opt/vc/lib"
+fi

From e0584bd4646cde768bd6a199f963c84fab68fc0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:18:08 -0500
Subject: [PATCH 581/752] kodi-rpi: unify rpi build options, fix linker paths

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

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 166659bea29..3d1cc29102d 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=3
+revision=4
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -51,6 +51,7 @@ configure_args="
  -DENABLE_VDPAU=OFF
  -DWITH_FFMPEG=/usr
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
 "
 case "$XBPS_TARGET_MACHINE" in
 	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"

From efae40cb14c3b91dc233df91ff532fd4e044117f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 15:18:08 -0500
Subject: [PATCH 582/752] smpeg2: unify rpi build options, fix linker paths

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

diff --git a/srcpkgs/smpeg2/template b/srcpkgs/smpeg2/template
index 763d0137ca7..5bc6ccf5f7c 100644
--- a/srcpkgs/smpeg2/template
+++ b/srcpkgs/smpeg2/template
@@ -1,7 +1,7 @@
 # Template file for 'smpeg2'
 pkgname=smpeg2
 version=2.0.0
-revision=3
+revision=4
 build_style=gnu-configure
 makedepends="SDL2-devel"
 short_desc="SDL2 MPEG Player Library"
@@ -12,24 +12,18 @@ distfiles="https://www.libsdl.org/projects/smpeg/release/smpeg2-${version}.tar.g
 checksum=979a65b211744a44fa641a9b6e4d64e64a12ff703ae776bafe3c4c4cd85494b3
 
 # Package build options
-build_options="gles"
+build_options="rpi"
 
 case "$XBPS_TARGET_MACHINE" in
-	arm*)
-		# Enable OpenGL/ES on rpi platforms
-		build_options_default="gles"
-		;;
+	# Enable OpenGL/ES on rpi platforms
+	armv[67]*) build_options_default="rpi" ;;
 esac
 
 
-if [ "$build_option_gles" ]; then
-	case "$XBPS_TARGET_MACHINE" in
-	armv[67]*)
-		# RaspberryPi, use Videocore IV
-		makedepends+=" rpi-userland-devel"
-		LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
-		;;
-	esac
+if [ "$build_option_rpi" ]; then
+	# Use Videocore IV on Raspberry Pi
+	makedepends+=" rpi-userland-devel"
+	LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host"
 fi
 
 smpeg2-devel_package() {

From f0dffc113b209e2f00935b0920554edff1609c97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Jan 2021 19:49:14 -0500
Subject: [PATCH 583/752] retroarch: make neon a global build option, default
 on armv7l only

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c3ab2846259..063ebf36e8c 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -26,11 +26,12 @@ homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc noen opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
+desc_option_neon="Enable support for ARM Neon SIMD extension"
 
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
@@ -91,9 +92,7 @@ case "$XBPS_TARGET_MACHINE" in
 		configure_args+=" --enable-threads"
 		;;
 	armv7*)
-		build_options+=" neon"
 		build_options_default+=" neon"
-		desc_option_neon="Enable support for ARM Neon SIMD extension"
 
 		configure_args+=" --enable-threads $(vopt_enable neon)"
 

From f92df9835e223f67044a33bcd624034731fd9aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 12 Jan 2021 01:42:17 -0300
Subject: [PATCH 584/752] lowdown: update to 0.7.9.

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

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

From f3135880bcc58623a3ecab8520b949d819ee82be Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Mon, 11 Jan 2021 15:53:04 -0500
Subject: [PATCH 585/752] radeontop: update to 1.3

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

diff --git a/srcpkgs/radeontop/template b/srcpkgs/radeontop/template
index 7c5d91ab645..4f36a8d6b03 100644
--- a/srcpkgs/radeontop/template
+++ b/srcpkgs/radeontop/template
@@ -1,6 +1,6 @@
 # Template file for 'radeontop'
 pkgname=radeontop
-version=1.2
+version=1.3
 revision=1
 archs="i686* x86_64*"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/clbr/radeontop"
 distfiles="https://github.com/clbr/radeontop/archive/v${version}.tar.gz"
-checksum=dced8f8e64e6bfac1f4054b5cdd986e984b80766547ba272870bc25291c68349
+checksum=0e6abacafa3c795ee783be18b736f6dfc7ff93c6e3c3237cc7c1684863e08100
 
 do_build() {
 	make CC="$CC" amdgpu=1

From d848c979bddc5c11d06f40aef18a7866171c4541 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 00:15:31 -0500
Subject: [PATCH 586/752] removed-packages: add djmount

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1391ec55958..bf072b83c9b 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=9
+revision=10
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -18,6 +18,7 @@ replaces="
  california<=0.4.0_4
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
+ djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2
  dleyna-server<=0.6.0_2

From 4470cc0a0a204c0bbd2519bf57f71588680a9c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 12 Jan 2021 08:20:24 +0100
Subject: [PATCH 587/752] geda: update to 1.10.2

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

diff --git a/common/shlibs b/common/shlibs
index 8f8117a371e..5e6a8d0c6ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2249,6 +2249,8 @@ libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1
 libopenraw.so.7 libopenraw-0.1.0_1
 libopenrawgnome.so.7 libopenraw-0.1.0_1
 libgeda.so.47 geda-1.10.1_1
+libgedacairo.so.1 geda-1.10.2_1
+libxornstorage.so.0 geda-1.10.2_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
 libgegl-0.3.so.0 gegl3-0.3.0_1
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 2e920b2d89b..d3ee7d151d6 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,6 +1,6 @@
 # Template file for 'geda'
 pkgname=geda
-version=1.10.1
+version=1.10.2
 revision=1
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
@@ -15,12 +15,11 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
-checksum=76d282ddeebfb63da8d9b347951e67ce9282b9547df81bde4b46a3851eb13359
-CFLAGS="-Wno-deprecated-declarations -fcommon"
+checksum=e862ab241528538fa3bee2739261f568011102b60c5e39a2f0358663c042c8a4
 python_version=2
 replaces="geda-data>=0"
 
-CFLAGS="-Wno-unused-function"
+CFLAGS="-Wno-deprecated-declarations -fcommon -Wno-unused-function"
 
 pre_configure() {
 	mkdir -p gnu

From 357800af9ce02f97c6c4e9e8ac767f0af2b2efb1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 08:45:06 +0100
Subject: [PATCH 588/752] golangci-lint: remove weird linkmode thing

i don't see why this is necessary, the cc command being called
does not imply anything other than bfd being used in the first
place anyway

and explicit -fuse-ld=bfd fails just the same on ppc64le
---
 srcpkgs/golangci-lint/template | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 199642ac150..726a0315e05 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,17 +12,6 @@ homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
 checksum=71739de1aa88defc6f08c7e5118705069fee51f4fcf303cb9b7a39215ef0c56d
 
-# XXX: LDFLAGS="-fuse-ld=bfd" does no longer work when cross compiling
-# 'go build runtime/cgo: invalid flag in go:cgo_ldflag: -fuse-ld=bfd'
-case "$XBPS_TARGET_MACHINE" in
-	ppc*)	# @q66 : ppc64le does not (yet?) support the internal linker
-		LDFLAGS="-fuse-ld=bfd"
-		;;
-	*)	# other targets can use go's internal linker
-		go_ldflags=" -linkmode internal"
-		;;
-esac
-
 post_install() {
 	vdoc README.md
 }

From ef8cb8122e4ef4b77e598665e9c411a202419d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 12 Jan 2021 09:11:23 +0100
Subject: [PATCH 589/752] aisleriot: update to 3.22.14

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

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d30d74ab9ee..a26d8c2f0cf 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,7 +1,7 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.13
-revision=2
+version=3.22.14
+revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
@@ -15,5 +15,5 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 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=25677dc789d84a4cd7736eef50992c95a1ecb0e6d8903eb0e2633502dd256a10
+checksum=23249cff1cad498a6c465a597d927ee4386bd0d9ecf0b189de84d6fc384f1160
 replaces="aisleriot-data>=0"

From a4bbfa7281fab88875139d1f681450112d8e36e9 Mon Sep 17 00:00:00 2001
From: rc-05 <rc23@email.it>
Date: Thu, 7 Jan 2021 02:55:20 +0000
Subject: [PATCH 590/752] juCi++: update to 1.6.2.

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

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1b37c9c3dd9..c7a4e8655f3 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,8 +1,8 @@
 # Template file for 'juCi++'
 pkgname=juCi++
-version=1.6.1
+version=1.6.2
 revision=1
-_libclangmm_commit="c807211edcd3894f0920fcc1c01476d898f93f8f"
+_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
 _tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
 wrksrc="jucipp-v${version}"
 build_style=cmake
@@ -16,8 +16,8 @@ homepage="https://gitlab.com/cppit/jucipp"
 distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz
 https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz
 https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz"
-checksum="9cbae04ace6b4f4a606b1dcd500c30a7232f83b21fea0201c1c37085974bd2c9
- 380a2e2cb31a3310c3ac31bb6778c844fe3947a216b19acbe69d415f3da4448a
+checksum="b2dc1d3ad6182c43dc23193e2c2ccb2c1e5eb66da361e66342f12aaeecdacad9
+ 33f17a21b8949f93ab9cdc1ab13d239867767fe2988f040ad96f6a173f46883b
  0bb5bd57f1b909a08d883a5a06a15bb55cfa34b2056bc63fe26ea2d5ff13fa38"
 nocross=yes #clang cannot be installed as makedepends when cross compiling
 

From 5abb467d3fa015f6afb0a806a7a4a0f115a89a2f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 09:51:07 +0100
Subject: [PATCH 591/752] go: update to 1.15.6

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 977c87da8d0..f4867859b8d 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.15.5
+version=1.15.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://golang.org/"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1
+checksum=890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817
 nostrip=yes
 noverifyrdeps=yes
 

From 04b844c739b36b35fb2f6e9b25572e6456d48387 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 09:55:43 +0100
Subject: [PATCH 592/752] golangci-lint: update to 1.35.2

---
 srcpkgs/golangci-lint/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 726a0315e05..de9cc114e16 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.35.0
+version=1.35.2
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -10,7 +10,10 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=71739de1aa88defc6f08c7e5118705069fee51f4fcf303cb9b7a39215ef0c56d
+checksum=31f245cb78a4f79d666a9357d5ea1f6ce30e15ea37d5c10c3ffb6765a158dc9d
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
 
 post_install() {
 	vdoc README.md

From 7bb1d9c8e407acef19d7a2fa8e5fe16222c00c49 Mon Sep 17 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, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 593/752] gtkspell: fix l10n dir

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

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From ad655fd70fe04279d0a47bf47e381b1eeedfdda0 Mon Sep 17 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, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 594/752] gxmessage: fix l10n dir

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

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From eb4037d9ea335982ca3be08f77ea0a77d45003ce Mon Sep 17 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, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 595/752] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From cd6cb60781da515f053ed7bb577cb52d27d8f914 Mon Sep 17 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, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 596/752] leafpad: fix l10n dir

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

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 0e37b809490a1b353c0b66c93e949270cc3da1f4 Mon Sep 17 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, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 597/752] libgnome-keyring: fix l10n dir

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

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From f81239d65e29747b10a40c4f3ea9a06aa9126206 Mon Sep 17 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, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 598/752] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From 80c854d0b83b31d03452c013a0a17a01d3501638 Mon Sep 17 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, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 599/752] lxinput: fix l10n dir

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

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 14c4843f7e79229bf1d3e9c220f199f89e16301f Mon Sep 17 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, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 600/752] lxlauncher: fix l10n dir

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

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 8df69f30cf17687df646f9c59f2df64ebc2fa7e0 Mon Sep 17 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, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 601/752] pcmanx-gtk2: fix l10n dir

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

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 456f5ff8bdb23734198714dc2de16b0bdcf98a2f Mon Sep 17 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, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 602/752] pidgin-libnotify: fix l10n dir

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

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02130df216d7d05c78bbed4e691613013cdf5316 Mon Sep 17 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, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 603/752] pidgin-otr: fix l10n dir

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

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From dc83cdef3fde2085349db8c30162b3254dbfa67b Mon Sep 17 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, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 604/752] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b43cf0ab651b4461e14cd1decaa3540f2af9d44a Mon Sep 17 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, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 605/752] xournal: fix l10n dir

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

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..36f11cead86 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,16 +1,22 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://xournal.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From 218997b892e22770a8ce6a9de308c7d8b0d57516 Mon Sep 17 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, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 606/752] spacefm: fix l10n dir

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

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From b72a6ada4069b60587cb1ac16cfbd5e7ed447a72 Mon Sep 17 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, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 607/752] udevil: fix l10n dir

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

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 49bbebd1d5c31348005dda6c914090b0778226db Mon Sep 17 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, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 608/752] ufraw: fix l10n dir

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

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 3c158bac8f2509c36a07b31455c7a40b3af2c568 Mon Sep 17 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, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 609/752] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 17fc597ea0a8c759c0054913fa2c2e3f4d387890 Mon Sep 17 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, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 610/752] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 0576744bb60063211f5dff80ee15c70149bca2e7 Mon Sep 17 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, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 611/752] lxappearance-obconf: fix l10n dir

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

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..063e6d0380a 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 87d2292b727f6b5dd492397496d874695d945c47 Mon Sep 17 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, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 612/752] lightdm-gtk-greeter: fix l10n dir

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

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..66651a7af8a 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --with-gtk2
  --enable-compile-warnings=no"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 5bf2a3d364c541432b3febab62dc07f021860800 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 12 Jan 2021 09:22:58 -0600
Subject: [PATCH 613/752] zfsbootmenu: update to 1.8.1.

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

diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 9f07a82f0de..4b36fd6865e 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'zfsbootmenu'
 pkgname=zfsbootmenu
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=gnu-makefile
 conf_files="/etc/zfsbootmenu/config.yaml"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/zbm-dev/zfsbootmenu"
 changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md"
 distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/v${version}.tar.gz"
-checksum=c9394bdf9f7a543ac73cee2584794354d0df99ab7291687f53cc044c489004c7
+checksum=b86e34448ccb43e4c4f2e6cad51886bb97252475318b79e27c963dc42f64e787
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)

From 016ccbc2b0e4640589032a7ffe4f2e1f0b9746e2 Mon Sep 17 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, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 614/752] libgnomecanvas: fix l10n dir

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

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..94f26d446f6 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,9 +10,15 @@ short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 6985d54c74f172c5e30742171aa3efb86f9f197b Mon Sep 17 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, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 615/752] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..83dc7323082 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,7 +5,7 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
 configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
@@ -20,6 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +30,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 90bf85bfa18904e9bffd5872f2ac1a9663742e1b Mon Sep 17 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, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 616/752] libcryptui: fix l10n dir

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

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..a0bfef4a32c 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,11 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +22,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From ff0b891d340c35d43b6565184dd769ff873a1f22 Mon Sep 17 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, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 617/752] gnome-screensaver: fix l10n dir

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

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From ca6776d275b0dad2e47bd0edf22ab232eee32994 Mon Sep 17 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, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 618/752] gtk2-engines: fix l10n dir

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

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
 configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 57bef130d34c07733e17e0be4d85dda94d4b3e84 Mon Sep 17 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, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 619/752] gtksourceview2: fix l10n dir

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

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 3bb9d85b7917e95ed380c0740870616d27ff69af Mon Sep 17 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, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 620/752] gnome-doc-utils: fix l10n dir

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

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From cd9b6184a4e02007c1c819de86fa26bc91f0f632 Mon Sep 17 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, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 621/752] pmount: fix l10n dir

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

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..8a826f4e0fe 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,19 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 53225a78e04d2be0357a6e7658bb7e44118b4653 Mon Sep 17 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, 24 Dec 2020 21:16:06 +0700
Subject: [PATCH 622/752] tomb: not provide gtk-2 tray

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

diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 274fff1c109..1173ce3df86 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,11 +1,10 @@
 # Template file for 'tomb'
 pkgname=tomb
 version=2.8.1
-revision=1
+revision=2
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="libnotify-devel gtk+-devel"
 depends="sudo gnupg cryptsetup pinentry zsh"
 short_desc="Minimalistic commandline tool to manage encrypted volumes"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -14,8 +13,8 @@ homepage="https://www.dyne.org/software/tomb/"
 distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
 checksum=74865ea3364706323a3ebe12886d5816dd86c90a100bc3b49fae6e60cbb7be16
 
-pre_build() {
-	sed -i extras/gtk-tray/Makefile \
+post_patch() {
+	vsed -i extras/gtk-tray/Makefile \
 		-e's;$(CC) ;$(CC) $(CFLAGS) $(LDFLAGS) ;'
 }
 
@@ -30,9 +29,4 @@ do_install() {
 	vdoc doc/TODO.org
 	vdoc doc/bertini_thesis.pdf
 	vdoc doc/tomb_manpage.pdf
-
-	# tomb-gtk-tray
-	cd extras/gtk-tray
-	make
-	vbin tomb-gtk-tray
 }

From 15e8b0469e0c8a7d88bc2b5e766eb68e34e772dd Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 12 Jan 2021 16:12:14 +0100
Subject: [PATCH 623/752] zoom: update to 5.4.57862.0110

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 6bf998ec56f..9784cc1ff02 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.4.57450.1220
+version=5.4.57862.0110
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -12,7 +12,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=e8762567f7fa957aa072fab2b090b84c1b8838c99d35354935d30c2fdc08253d
+checksum=640c1785b6779d3e8f1a4482d6f9d7db2fd750e65fa5e774af73ae79d23ada06
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 77311b995a1b57a9ab2096313c7f263883a18127 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:08:36 -0500
Subject: [PATCH 624/752] python3-Pygments: update to 2.7.4.

---
 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 b09860ca925..84603bdf79a 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.7.3
+version=2.7.4
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://pygments.org"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716
+checksum=df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From fcc28143e35aef6204ce8e81cc38c3318d96a998 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:16:13 -0500
Subject: [PATCH 625/752] python3-hypercorn: update to 0.11.2.

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

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index e33dff0de19..9635ad9fe53 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,19 +1,28 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
-version=0.11.1
+version=0.11.2
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-h11 python3-hyper-h2 python3-priority
  python3-toml python3-typing_extensions python3-wsproto"
+checkdepends="python3-pytest-asyncio $depends"
 short_desc="Python ASGI server based on hyper and inspired by gunicorn"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://gitlab.com/pgjones/hypercorn"
 changelog="https://gitlab.com/pgjones/hypercorn/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=ce54464ee775d99a5f4c4408f3b52bf31c43057f40543aff386b790ecdc764da
+checksum=5030666663b3a048f971db9f728a76d4e0075a06e2a1fbed67b5c47cb11e7a5f
+
+do_check() {
+	vsed -i setup.cfg -e '/addopts/d'
+	# Ignored tests depend on packages not offered by Void
+	PYTHONPATH=src python3 -m pytest \
+		--ignore-glob="tests/trio/*" \
+		--ignore=tests/middleware/test_wsgi.py
+}
 
 post_install() {
 	vlicense LICENSE

From 2e3e7014aaf029a81f5c76a82012fe53a660f60c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:18:23 -0500
Subject: [PATCH 626/752] python3-pytools: update to 2021.1.

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

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5fcf3cb1a0f..bdeab1325db 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2020.4.4
+version=2021.1
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-decorator python3-appdirs python3-six python3-numpy"
-checkdepends="python3-mpi4py python3-numpy python3-six python3-appdirs python3-decorator"
+checkdepends="python3-pytest python3-mpi4py $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=3645ed839cf4d79cb4bf030f37ddaeecd7fe5e2d6698438cc36c24a1d5168809
+checksum=073ae22a0ae946e2db97164f2eb24a599cd3a51430384aa40859dffd73056c40
 
 post_install() {
 	vlicense LICENSE

From 4609c404a1b61bb507e140a3ee9fecc7fd86fb7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:20:50 -0500
Subject: [PATCH 627/752] python3-tifffile: update to 2021.1.11.

---
 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 84536d54c5e..caf54206905 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2020.12.8
+version=2021.1.11
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,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=aa823c1185ff42bdcae549883244802122f404a51bb6fb893a223df5330c6d81
+checksum=fba3d3718634dd705d8a025421b1a241efad6166533b1be304a3b1a59a68e941
 
 post_install() {
 	vlicense LICENSE

From 46b89ebaad930e0a6e6587a38a93aab20aa2ff31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:24:40 -0500
Subject: [PATCH 628/752] python3-setuptools: update to 51.1.2.

---
 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 c3688cd4b0c..58346bb37e8 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=51.1.1
+version=51.1.2
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -14,7 +14,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=0b43d1e0e0ac1467185581c2ceaf86b5c1a1bc408f8f6407687b0856302d1850
+checksum=4fa149145ba5dcd4aaa89912ec92393a31170eaf17fe0268b1429538bad1f85a
 alternatives="setuptools:easy_install:/usr/bin/easy_install3"
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"

From c69e081244ebe0f9823109ac2ab5b061a21f05a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 09:28:29 -0500
Subject: [PATCH 629/752] python3-virtualenv: update to 20.3.0.

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index fc0010d96d1..c26f27bde83 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.2.2
+version=20.3.0
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-setuptools python3-appdirs python3-distlib python3-filelock python3-six"
-checkdepends="python3-pytest-mock python3-flaky python3-devel $depends"
+checkdepends="python3-pytest-mock python3-flaky python3-devel python3-pip $depends"
 short_desc="Virtual Python environment builder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b
+checksum=7992b8de87e544a4ab55afc2240bf8388c4e3b5765d03784dad384bfdf9097ee
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From a6cd2dc447992290ff55e881910f62fae806e83e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 10:59:21 -0500
Subject: [PATCH 630/752] tox: update to 3.21.0.

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

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2d39e47d019..39f3dd4cd00 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,19 +1,31 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.20.1
-revision=2
+version=3.21.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-filelock python3-packaging
  python3-pluggy python3-pytest python3-toml python3-virtualenv"
-checkdepends="${depends} python3-flaky python3-pathlib2"
+checkdepends="${depends} python3-pytest-mock
+ python3-flaky python3-pathlib2 python3-freezegun"
 short_desc="Generic virtualenv management and test command line tool"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6
+checksum=8cccede64802e78aa6c69f81051b25f0706639d1cbbb34d9366ce00c70ee054f
+
+do_check() {
+	# Skipped tests fail to find module or rely on missing entrypoint script
+	PYTHONPATH=src python3 -m pytest \
+		-k "not test_parallel \
+			and not test_tox_console_script \
+			and not test_tox_quickstart_script \
+			and not test_provision_cli_args_ignore \
+			and not test_provision_interrupt_child \
+			and not test_provision_non_canonical_dep"
+}
 
 post_install() {
 	vlicense LICENSE

From ce8022934dd400b379b2448eb1aa277f49716fa4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:00:57 -0500
Subject: [PATCH 631/752] certbot: update to 1.11.0.

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

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 4732173b143..7ab61e71740 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.10.1
+version=1.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ 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=0d9ee3fc09e0d03b2d1b1f1c4916e61ecfc6904b4216ddef4e6a5ca1424d9cb7
+checksum=6b0ce04e55379aff0a47f873fa05c084538ad0f4a9b79f33108dbb0a7a668b43
 
 do_check() {
 	python3 -m pytest

From 56e5d6684c063f952c9c7b33da224ac02f51ef08 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:03:13 -0500
Subject: [PATCH 632/752] python3-acme: update to 1.11.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 3517f27eced..8424db282cf 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.10.1
+version=1.11.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ 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=fcbb559aedc96b404edf593e78517dcd7291984d5a37036c3fc77f3c5c122fd8
+checksum=092eb09a074a935da4c10f66cb8634ffb2cc2d2cc1035d2998d608996efab924
 
 do_check() {
 	python3 -m pytest

From ae5b94c55664be50c32d8077d5f20deaeea32163 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:04:07 -0500
Subject: [PATCH 633/752] certbot-apache: update to 1.11.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 2e31c4c0674..9ee797aa5f8 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.10.1
+version=1.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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=97ed637b4c7b03820db6c69aa90145dc989933351d46a3d62baf6b71674f0a10
+checksum=3ed001427ec0b49324f2b9af7170fa6e6e88948fa51c3678b07bf17f8138863d
 
 do_check() {
 	python3 -m pytest

From 12ac65ca0e26e6fcc493d524d28c66dcdf9bc862 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 12 Jan 2021 11:04:40 -0500
Subject: [PATCH 634/752] certbot-nginx: update to 1.11.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 796fb1c2853..23f7dd5435c 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.10.1
+version=1.11.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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=c0bbeccf85f46b728fd95e6bb8c2649d32d3383d7f47ea4b9c312d12bf04d2f0
+checksum=9afe611f99a78b8898941b8ad7bdcf7f3c2b6e0fce27125268f7c713e64b34ee
 
 do_check() {
 	python3 -m pytest

From f9171463ccbb73c59997e8d48898108e96bd74d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Jan 2021 17:25:31 +0100
Subject: [PATCH 635/752] nncp: update to 5.5.1.

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

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

From 941ca7e739fbee9b219d45100b002a566d242735 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jan 2021 15:31:40 -0500
Subject: [PATCH 636/752] zfs: update to 2.0.1.

Closes: #27723.
---
 srcpkgs/zfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 1e9de9140a5..1af53405226 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.0
+version=2.0.1
 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=3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311
+checksum=71510a6381d9910d75fa52d7bbf0863aa80ff88f337c8a023e267f4ba8486978
 
 patch_args="-Np1"
 

From a2284bc181a0268d7f5cddaf9219699bd1933fc4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 18:07:37 +0100
Subject: [PATCH 637/752] pueue: now broken on non-x86/arm because of ring

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

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index adb0e9ea182..9323800e377 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -10,6 +10,11 @@ homepage="https://github.com/Nukesor/pueue"
 distfiles="https://github.com/Nukesor/pueue/archive/v${version}.tar.gz"
 checksum=dbd333079df9249609f6a01d7c96175ec9d74f9d621688b95ec755134b7fa1f5
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From dbec816faa2bcd954d3130216521940cce50378e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 12 Jan 2021 10:37:52 +0100
Subject: [PATCH 638/752] slack-desktop: update to 4.12.2

Closes: #27853 [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 d480ce6b5ca..7a2199f9589 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.12.1
+version=4.12.2
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=a9e71340a7d37cf9fbfa9206ad000038c0bb74fd3df445506cc740d6f0eb3ce6
+checksum=1b9b90234efc37b01b84426ce9aff5ec7a22e4349dc2f60b3354ffb6dac4c38b
 restricted=yes
 repository="nonfree"
 nopie=yes

From 4225e6113e035a9936494e975d783b43fcaada5d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 12 Jan 2021 11:40:43 +0100
Subject: [PATCH 639/752] hoogle: update to 5.0.18.1

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

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 40dc26778d1..4305ac4ae6e 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,6 +1,6 @@
 # Template file for 'hoogle'
 pkgname=hoogle
-version=5.0.18
+version=5.0.18.1
 revision=1
 build_style=haskell-stack
 stackage="lts-16.13"
@@ -10,7 +10,7 @@ maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="http://hoogle.haskell.org/"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=fa624618ccbf5772af5628b791094fa43301f1c25137e06ed65c203e0de8b4c3
+checksum=62388f8a13e8fd3c7befe9c12543eb9f1b53a5fb948390c69eb2985d39f927aa
 nopie_files="/usr/bin/hoogle"
 nocross=yes # Can't yet cross compile Haskell
 

From 1b69b5a2ded5629573182adb49613df56f23b9e8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 18:24:42 +0100
Subject: [PATCH 640/752] Revert "mdcat: update to 0.22.2."

This reverts commit e04e5c10da12b5c75aaff684d9f65826d5c97425.

There were zero functional changes in the release and it now
depends on non-portable stuff, which breaks build outside x86/arm
---
 srcpkgs/mdcat/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index 9a91d162d53..df89652f874 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,7 +1,8 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.22.2
-revision=1
+reverts="0.22.2_1"
+version=0.22.1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
@@ -11,4 +12,4 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"
 homepage="https://github.com/lunaryorn/mdcat"
 distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=92102c448c1742aa69604817d7d209c69ce1db5261cb6d8f0bb98cdc6c4f02f9
+checksum=b14846542fb8b60ac0235b399136372df7569aa59ed63f3faf88ff7a485abe5f

From da6e72daf9fa89f77022cd9604458175f828daaf Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Jan 2021 17:43:38 +0100
Subject: [PATCH 641/752] remove --with-locales-dir where it doesn't belong

---
 srcpkgs/brasero/template               | 3 +--
 srcpkgs/dia/template                   | 1 -
 srcpkgs/gconf-editor/template          | 1 -
 srcpkgs/gdmap/template                 | 2 +-
 srcpkgs/gimp-lqr-plugin/template       | 1 -
 srcpkgs/gmpc/template                  | 1 -
 srcpkgs/gnome-mime-data/template       | 1 -
 srcpkgs/gnome-mplayer/template         | 3 +--
 srcpkgs/gnome-nettool/template         | 1 -
 srcpkgs/gnome-system-log/template      | 2 +-
 srcpkgs/gpicview/template              | 2 +-
 srcpkgs/gtkpod/template                | 2 +-
 srcpkgs/gtkspell/template              | 2 +-
 srcpkgs/gxmessage/template             | 1 -
 srcpkgs/homebank/template              | 1 -
 srcpkgs/leafpad/template               | 1 -
 srcpkgs/libgnome-keyring/template      | 2 +-
 srcpkgs/libwnck2/template              | 2 +-
 srcpkgs/lxinput/template               | 2 +-
 srcpkgs/lxlauncher/template            | 2 +-
 srcpkgs/pcmanx-gtk2/template           | 2 +-
 srcpkgs/pidgin-libnotify/template      | 2 +-
 srcpkgs/pidgin-otr/template            | 1 -
 srcpkgs/pidgin-privacy-please/template | 1 -
 srcpkgs/xdg-user-dirs-gtk/template     | 1 -
 25 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 9ff2a6468ea..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -4,8 +4,7 @@ version=3.12.2
 revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-locales-dir=/usr/share/locale
- --disable-schemas-compile --disable-caches"
+configure_args="--disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 4a4037c9cc4..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -3,7 +3,6 @@ pkgname=dia
 version=0.97.3
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
  libart-devel libxslt-devel"
diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 4046a204711..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -4,7 +4,6 @@ version=3.0.1
 revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
- --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 2dc46b6e074..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -3,7 +3,7 @@ pkgname=gdmap
 version=0.8.1
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
+configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 45d8ce44f05..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -3,7 +3,6 @@ pkgname=gimp-lqr-plugin
 version=0.7.2
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index f3283baafb8..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -3,7 +3,6 @@ pkgname=gmpc
 version=11.8.16
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 4bb4769baa2..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -3,7 +3,6 @@ pkgname=gnome-mime-data
 version=2.18.0
 revision=6
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1ec69337940..1004710eee4 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -3,8 +3,7 @@ pkgname=gnome-mplayer
 version=1.0.9
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale
- --disable-schemas-install"
+configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index fad533c4901..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -3,7 +3,6 @@ pkgname=gnome-nettool
 version=3.8.1
 revision=6
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 653a2a94fce..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -3,7 +3,7 @@ pkgname=gnome-system-log
 version=3.9.90
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
+configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index be07a3dc96d..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -3,7 +3,7 @@ pkgname=gpicview
 version=0.2.5
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 15c75642635..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -3,7 +3,7 @@ pkgname=gtkpod
 version=2.1.5
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index 2b185f6ee9a..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -3,7 +3,7 @@ pkgname=gtkspell
 version=2.0.16
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 0d349d8bbe5..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -3,7 +3,6 @@ pkgname=gxmessage
 version=3.4.3
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="Clone of xmessage based on GTK+"
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index c987e54e0e7..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -3,7 +3,6 @@ pkgname=homebank
 version=5.4.3
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bd613e392ae..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -3,7 +3,6 @@ pkgname=leafpad
 version=0.8.18.1
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 193b8b21994..84418574389 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -4,7 +4,7 @@ version=3.12.0
 revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
+configure_args="$(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..08300d85b26 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -5,7 +5,7 @@ revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
+configure_args="$(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index 8736f3f854a..307d609f33d 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -3,7 +3,7 @@ pkgname=lxinput
 version=0.3.5
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index 44f7b806ea5..5b91dc9c720 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -3,7 +3,7 @@ pkgname=lxlauncher
 version=0.2.5
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 68269d5fea0..0c3d0e3bbf8 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -3,7 +3,7 @@ pkgname=pcmanx-gtk2
 version=1.3
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
+configure_args="--enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index bc71b0e602c..5a627f32383 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -3,7 +3,7 @@ pkgname=pidgin-libnotify
 version=0.14
 revision=3
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
+configure_args="--disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 1ec42101f17..32d3be6623e 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -3,7 +3,6 @@ pkgname=pidgin-otr
 version=4.0.2
 revision=2
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 18499372923..66f7edf6dde 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -3,7 +3,6 @@ pkgname=pidgin-privacy-please
 version=0.7.1
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool libtool pkg-config libpurple-devel
  pidgin-devel glib-devel"
 makedepends="libpurple-devel pidgin-devel libglib-devel"
diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index b89f1e28d63..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -3,7 +3,6 @@ pkgname=xdg-user-dirs-gtk
 version=0.10
 revision=4
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"

From b7310f5079677e6b74e10a8165b1808136cd7065 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 19:06:12 +0100
Subject: [PATCH 642/752] frei0r-plugins: update to 1.7.0.

Also added build options for cairo and gavl.
---
 srcpkgs/frei0r-plugins/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/frei0r-plugins/template b/srcpkgs/frei0r-plugins/template
index 54adf54a355..e980aa63617 100644
--- a/srcpkgs/frei0r-plugins/template
+++ b/srcpkgs/frei0r-plugins/template
@@ -1,12 +1,17 @@
 # Template file for 'frei0r-plugins'
 pkgname=frei0r-plugins
-version=1.6.1
+version=1.7.0
 revision=1
 build_style=cmake
 hostmakedepends="autoconf"
+# XXX: opencv should also be a possible dependency
+makedepends="$(vopt_if gavl gavl-devel) $(vopt_if cairo cairo-devel)"
 short_desc="Minimalistic API for a collection of free video effects plugins"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://frei0r.dyne.org/"
 distfiles="https://files.dyne.org/frei0r/releases/frei0r-plugins-${version}.tar.gz"
-checksum=e0c24630961195d9bd65aa8d43732469e8248e8918faa942cfb881769d11515e
+checksum=1b1ff8f0f9bc23eed724e94e9a7c1d8f0244bfe33424bb4fe68e6460c088523a
+
+build_options="cairo gavl"
+build_options_default="cairo"

From cbb64ce39bef177bf6d969115d83f10bbbcdba37 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Jan 2021 13:04:49 -0600
Subject: [PATCH 643/752] common/build-style/qmake: fix variable name

---
 common/build-style/qmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 5808d7a60bd..fa54c005f36 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -13,7 +13,7 @@ do_configure() {
 		qmake="/usr/lib/qt/bin/qmake"
 	fi
 	if [ -z "${qmake}" ]; then
-		msg_error "${pkgver}: Could not find qmake - missing in hostdepends?\n"
+		msg_error "${pkgver}: Could not find qmake - missing in hostmakedepends?\n"
 	fi
 	if [ "$CROSS_BUILD" ] && [ "$qmake" == "/usr/lib/qt5/bin/qmake" ]; then
 		case $XBPS_TARGET_MACHINE in

From d7f1eb4d130d87e220630b50b571e354e028faaf Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Jan 2021 20:44:03 +0100
Subject: [PATCH 644/752] nmap: revert to 7.80 due to licensing issues

nmap >= 7.90 is distributed under a modified license that many consider
problematic.

https://github.com/nmap/nmap/issues/2199
Gentoo bug: https://bugs.gentoo.org/749390
Debian bug: https://bugs.debian.org/972216
Guix discussion: https://lists.gnu.org/archive/html/guix-devel/2020-10/msg00227.html

Along, link against libssh2 instead of using the bundled version.
---
 srcpkgs/nmap/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7d46635229b..db5d413cfb1 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -1,17 +1,19 @@
 # Template file for 'nmap'
 pkgname=nmap
-version=7.91
-revision=1
+reverts="7.90_1 7.91_1"
+version=7.80
+revision=2
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel pcre-devel $(vopt_if lua lua53-devel)"
+makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+ $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:nmap"
 homepage="https://nmap.org"
 distfiles="https://nmap.org/dist/nmap-${version}.tar.bz2"
-checksum=18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300
+checksum=fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa
 python_version=2
 
 build_options="lua"
@@ -22,7 +24,7 @@ alternatives="
 	nc:nc.1:/usr/share/man/man1/ncat.1"
 
 post_install() {
-	vlicense LICENSE
+	vlicense COPYING
 
 	# do not use bundled certificates, use only system ones
 	rm -f ${DESTDIR}/usr/share/ncat/ca-bundle.crt

From 4f78eb06dd8fad991ec0fca64b15a21128362019 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Jan 2021 21:30:48 +0100
Subject: [PATCH 645/752] linux5.10: update to 5.10.7.

---
 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 f987b44e16a..1bad20376bd 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.6
+version=5.10.7
 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=7767d02c1cb5eb2a8d3c2b15a3f93e85b98baa6e9d93a3b9e3ec0e959d0a690b
+checksum=4cbf6e09f90f2ae7160432c884d5a2aeb9d33a07ca7f50eb7d80f427706ffabe
 python_version=3
 patch_args="-Np1"
 

From a8eaa7dc1e5bbcd4eb841bde8090853c4f0cedca Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 12 Jan 2021 15:26:06 -0600
Subject: [PATCH 646/752] nmap: correct revision

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

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index db5d413cfb1..7429d64cf81 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,7 +2,7 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=2
+revision=5
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"

From 8342578482226ffe73032f94d4ba45f9cdb93a1a Mon Sep 17 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, 8 Jan 2021 08:02:10 +0700
Subject: [PATCH 647/752] gns3-gui: not depends on python3-sip

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

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index f7f51364548..1d7d84c4c65 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,11 +1,11 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.17
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry
- python3-PyQt5-svg python3-PyQt5-websockets python3-sip xterm inetutils-telnet
+ python3-PyQt5-svg python3-PyQt5-websockets xterm inetutils-telnet
  gns3-net-converter python3-distro"
 checkdepends="${depends}"
 short_desc="Graphical Network Simulator 3 - GUI"

From eefd8a7ad41f8842b77cc63f83af38318dfcecfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 9 Jan 2021 17:25:29 +0100
Subject: [PATCH 648/752] doctl: update to 1.54.1.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 2c1ff591e98..67429c711ef 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.54.0
+version=1.54.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -11,4 +11,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=bdb2dfb18ac0047c55343a74aa872cd5251881657d88ceb432af894042767d09
+checksum=f61746217994a7270ac32d9707a7c2906e94821238bdb938b0e3be70f2f2dcb5

From 33ca6c899e9f93d2bde732189b445e0b5ced2f52 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Wed, 13 Jan 2021 13:28:26 +0100
Subject: [PATCH 649/752] dnscrypt-proxy: update to 2.0.45.

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

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 969a152fab3..09d53d038dd 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,6 +1,6 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.44
+version=2.0.45
 revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
 changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
 distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=c2c9968f07a414e973ec5734f4598d756a35c32beedb18268590ea1355794237
+checksum=f7aac28c6a60404683d436072b89d18ed3bb309f8d8a95c8e87ad250da190821
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"

From fc2d008044fc2dc9dc70d02a0899fa74430496f2 Mon Sep 17 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, 8 Jan 2021 08:05:44 +0700
Subject: [PATCH 650/752] sip: rename to sip4

---
 srcpkgs/python3-sip            |  2 +-
 srcpkgs/python3-sip-devel      |  2 +-
 srcpkgs/{sip => sip4}/template | 13 ++++++++-----
 srcpkgs/{sip => sip4}/update   |  0
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename srcpkgs/{sip => sip4}/template (82%)
 rename srcpkgs/{sip => sip4}/update (100%)

diff --git a/srcpkgs/python3-sip b/srcpkgs/python3-sip
index 633f7c0bcce..27dcc148ae7 120000
--- a/srcpkgs/python3-sip
+++ b/srcpkgs/python3-sip
@@ -1 +1 @@
-sip
\ No newline at end of file
+sip4
\ No newline at end of file
diff --git a/srcpkgs/python3-sip-devel b/srcpkgs/python3-sip-devel
index 633f7c0bcce..27dcc148ae7 120000
--- a/srcpkgs/python3-sip-devel
+++ b/srcpkgs/python3-sip-devel
@@ -1 +1 @@
-sip
\ No newline at end of file
+sip4
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip4/template
similarity index 82%
rename from srcpkgs/sip/template
rename to srcpkgs/sip4/template
index 87d0c5c6ed6..30de98f8320 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip4/template
@@ -1,7 +1,8 @@
-# Template file for 'sip'
-pkgname=sip
+# Template file for 'sip4'
+pkgname=sip4
 version=4.19.24
-revision=3
+revision=4
+wrksrc="sip-$version"
 hostmakedepends="python3-devel"
 makedepends="${hostmakedepends}"
 short_desc="Python extension module generator for C/C++ libraries"
@@ -10,12 +11,14 @@ license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
 checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
+replaces="sip<=${version}_${revision}"
+provides="sip-${version}_${revision}"
 
 do_build() {
 	python3 configure.py \
 		CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
-		INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+		INCDIR="${XBPS_CROSS_BASE}/${py3_inc}"
 	make ${makejobs}
 }
 
@@ -40,7 +43,7 @@ python3-sip_package() {
 }
 
 python3-sip-devel_package() {
-	depends="python3-sip-${version}_${revision} sip-${version}_${revision}"
+	depends="python3-sip-${version}_${revision} sip4-${version}_${revision}"
 	short_desc="Python3 SIP bindings - development files"
 	pkg_install() {
 		vmove ${py3_inc}
diff --git a/srcpkgs/sip/update b/srcpkgs/sip4/update
similarity index 100%
rename from srcpkgs/sip/update
rename to srcpkgs/sip4/update

From daec1899807b332052a15583c849e95a5c83bbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 13 Jan 2021 07:36:15 +0700
Subject: [PATCH 651/752] python3-orocos-kdl: sip renamed to sip4

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

diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template
index 728ed73d780..281ea8978c5 100644
--- a/srcpkgs/python3-orocos-kdl/template
+++ b/srcpkgs/python3-orocos-kdl/template
@@ -6,7 +6,7 @@ wrksrc=orocos_kinematics_dynamics-${version}
 build_wrksrc=python_orocos_kdl
 build_style=cmake
 configure_args="-DPYTHON_VERSION=3 -DSIP_EXECUTABLE=/usr/bin/sip"
-hostmakedepends="python3 python3-sip sip"
+hostmakedepends="python3 python3-sip sip4"
 makedepends="python3-sip-devel python3-devel orocos-kdl-devel eigen3.2"
 depends="python3 python3-sip"
 short_desc="Python3 Bindings for Orocos Kinematics and Dynamics C++ library"

From eacd8087a96bfdefa42b0ec8b871025da1254df0 Mon Sep 17 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, 8 Jan 2021 08:07:11 +0700
Subject: [PATCH 652/752] sip5: rename to sip

---
 srcpkgs/{sip5 => sip}/template | 15 +++++++++++----
 srcpkgs/{sip5 => sip}/update   |  0
 srcpkgs/sip5                   |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename srcpkgs/{sip5 => sip}/template (69%)
 rename srcpkgs/{sip5 => sip}/update (100%)
 create mode 120000 srcpkgs/sip5

diff --git a/srcpkgs/sip5/template b/srcpkgs/sip/template
similarity index 69%
rename from srcpkgs/sip5/template
rename to srcpkgs/sip/template
index b8e3d0bf10d..72577b77f0c 100644
--- a/srcpkgs/sip5/template
+++ b/srcpkgs/sip/template
@@ -1,22 +1,29 @@
-# Template file for 'sip5'
-pkgname=sip5
+# Template file for 'sip'
+pkgname=sip
 version=5.5.0
 revision=1
-wrksrc="sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
 makedepends="python3-devel"
 depends="python3-setuptools python3-packaging python3-toml"
-short_desc="SIP 5 - Python 3 bindings generator for C/C++ libraries"
+short_desc="SIP - Python 3 bindings generator for C/C++ libraries"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
 checksum=5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5
 lib32disabled=yes
+replaces="sip5<=${version}_${revision}"
+provides="sip5-${version}_${revision}"
 
 post_install() {
 	sed -n '1,/SUCH DAMAGE/p' sipbuild/project.py >NOTICE
 	vlicense NOTICE
 	vlicense LICENSE
 }
+
+sip5_package() {
+	short_desc+=" - transition"
+	build_style=meta
+	depends="sip>=${version}_${revision}"
+}
diff --git a/srcpkgs/sip5/update b/srcpkgs/sip/update
similarity index 100%
rename from srcpkgs/sip5/update
rename to srcpkgs/sip/update
diff --git a/srcpkgs/sip5 b/srcpkgs/sip5
new file mode 120000
index 00000000000..633f7c0bcce
--- /dev/null
+++ b/srcpkgs/sip5
@@ -0,0 +1 @@
+sip
\ No newline at end of file

From 4cfaa8fb8a0548ea612b6981891d37c699130e43 Mon Sep 17 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, 8 Jan 2021 08:08:58 +0700
Subject: [PATCH 653/752] sip: update to 6.0.0.

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

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 72577b77f0c..eb7a4ac56f4 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=5.5.0
+version=6.0.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=5d024c419b30fea8a6de8c71a560c7ab0bc3c221fbfb14d55a5b865bd58eaac5
+checksum=6185160e1aa8e167b5919c4761cbbf68cc7478d34fb655b3a28b3eb9acb5943a
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From 3b6f7d42fbba467e6bcee3c399deb983286d8978 Mon Sep 17 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, 8 Jan 2021 07:52:02 +0700
Subject: [PATCH 654/752] python3-PyQt-builder: update to 1.7.0.

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

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index 1d6c8fa73d4..956a6ab1cde 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc=PyQt-builder-$version
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3 sip5>=5.5.0"
+hostmakedepends="python3-setuptools sip"
+depends="python3 sip>=6.0.0"
 short_desc="PEP 517 compliant PyQt build system"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://www.riverbankcomputing.com/software/pyqt/"
 distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz"
-checksum=fb80f01407718bfc68f78e276f2543fcfc5b5900b1187c1fd1f2ff51a6f2a13c
+checksum=b6e3c826f98ff4006ecb34df491ac6062a023b63a32e9f9f50904867aff72f2e
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From 0eb05bcc2f1ff46d2c817f1fb455f93dda09df9c Mon Sep 17 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, 8 Jan 2021 07:54:12 +0700
Subject: [PATCH 655/752] python3-PyQt5-webengine: sip5 has been renamed to sip

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

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 920cae92627..ae385283b7f 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,7 +3,7 @@ pkgname=python3-PyQt5-webengine
 version=5.15.2
 revision=1
 wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip5 qt5-webengine-devel
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip qt5-webengine-devel
  python3-PyQt-builder python3-PyQt5-devel
  qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
 makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel

From bad0df0447d620f1f815c3b91e4ebd805f8b3bf2 Mon Sep 17 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, 8 Jan 2021 07:55:20 +0700
Subject: [PATCH 656/752] python3-PyQt5: depends on new sip

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

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index bac89e57965..2a2733b439c 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
 version=5.15.2
-revision=1
+revision=2
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
 build_helper=qemu
@@ -193,7 +193,7 @@ python3-PyQt5-devel-tools_package() {
 	}
 }
 python3-PyQt5-devel_package() {
-	depends="sip5 python3-PyQt5-${version}_${revision}"
+	depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove ${py3_sitelib}/PyQt5/bindings

From b0e324354c3e6a01ac1781fa6ed90b7d5cf85b09 Mon Sep 17 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, 8 Jan 2021 07:56:13 +0700
Subject: [PATCH 657/752] python3-sip-PyQt5: build with new sip

---
 srcpkgs/python3-sip-PyQt5/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index e1d1c45603d..e144a1e91f2 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -4,7 +4,7 @@ version=12.8.1
 revision=1
 wrksrc="PyQt5_sip-$version"
 build_style=python3-module
-hostmakedepends="python3-devel python3-setuptools sip5"
+hostmakedepends="python3-devel python3-setuptools sip"
 makedepends="python3-devel"
 short_desc="Python 3 PyQt5 SIP bindings with C and C++"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,11 @@ distfiles="${PYPI_SITE}/P/PyQt5_sip/PyQt5_sip-${version}.tar.gz"
 checksum=30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd
 lib32disabled=yes
 
+post_extract() {
+	# for do_check
+	mkdir -p PyQt5
+}
+
 post_install() {
-	vlicense /usr/share/licenses/sip5/LICENSE
+	vlicense /usr/share/licenses/sip/LICENSE
 }

From 97ae7ab99e906fe46c8d05ea88b61bb921a8d46f Mon Sep 17 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, 12 Jan 2021 20:37:31 +0700
Subject: [PATCH 658/752] pcc: merge pcc-libs template

to break cyclic dependdencies.
---
 srcpkgs/pcc-libs                              |  1 +
 srcpkgs/pcc-libs/template                     | 24 -------
 .../{pcc-libs => pcc}/patches/build_PIC.patch | 12 ++--
 srcpkgs/pcc/patches/void.patch                |  4 +-
 srcpkgs/pcc/patches/x86-build-fix.patch       |  4 +-
 srcpkgs/pcc/template                          | 72 +++++++++++++++----
 6 files changed, 69 insertions(+), 48 deletions(-)
 create mode 120000 srcpkgs/pcc-libs
 delete mode 100644 srcpkgs/pcc-libs/template
 rename srcpkgs/{pcc-libs => pcc}/patches/build_PIC.patch (64%)

diff --git a/srcpkgs/pcc-libs b/srcpkgs/pcc-libs
new file mode 120000
index 00000000000..0f083540766
--- /dev/null
+++ b/srcpkgs/pcc-libs
@@ -0,0 +1 @@
+pcc
\ No newline at end of file
diff --git a/srcpkgs/pcc-libs/template b/srcpkgs/pcc-libs/template
deleted file mode 100644
index bca409786bd..00000000000
--- a/srcpkgs/pcc-libs/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'pcc-libs'
-pkgname=pcc-libs
-_snapshot=20190420
-_distver=1.1.0
-version=${_distver}.${_snapshot}
-revision=1
-archs="i686* x86_64*"
-wrksrc=${pkgname}-${_distver}.BETA
-build_style=gnu-configure
-configure_args="CC=pcc"
-hostmakedepends="flex pcc"
-short_desc="Portable C Compiler - Support Libraries"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="http://pcc.ludd.ltu.se/"
-distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/${pkgname}-${_distver}.BETA-${_snapshot}.tgz"
-checksum=e810aa4d6683e769f490f734b13a296b33c2511ddba646bc526eb85532f1a23a
-nodebug=1
-nocross=1
-
-post_install() {
-	sed -n '2,25p' libpcc/cxmuldiv.c > LICENSE
-	vlicense LICENSE
-}
diff --git a/srcpkgs/pcc-libs/patches/build_PIC.patch b/srcpkgs/pcc/patches/build_PIC.patch
similarity index 64%
rename from srcpkgs/pcc-libs/patches/build_PIC.patch
rename to srcpkgs/pcc/patches/build_PIC.patch
index a11fcff6c3a..3b7eea6a13f 100644
--- a/srcpkgs/pcc-libs/patches/build_PIC.patch
+++ b/srcpkgs/pcc/patches/build_PIC.patch
@@ -1,7 +1,7 @@
 Respect passed CFLAGS to configure and force PIC object generation.
 
---- csu/linux/Makefile.orig	2011-02-24 12:59:36.988078869 +0100
-+++ csu/linux/Makefile	2011-02-24 13:01:29.434007771 +0100
+--- pcc-libs/csu/linux/Makefile.orig	2011-02-24 12:59:36.988078869 +0100
++++ pcc-libs/csu/linux/Makefile	2011-02-24 13:01:29.434007771 +0100
 @@ -4,7 +4,7 @@ VERSION ?= 0.9.9
  PCCLIBDIR ?= /usr/local/lib/pcc/$(TARGET)/$(VERSION)/lib
  SRCDIR ?= .
@@ -11,8 +11,8 @@ Respect passed CFLAGS to configure and force PIC object generation.
  
  OBJS = crt0.o crt1.o gcrt1.o crti.o crtn.o crtbegin.o crtend.o
  
---- libpcc/Makefile.in.orig	2011-02-24 13:02:15.570566278 +0100
-+++ libpcc/Makefile.in	2011-02-24 13:02:33.577393664 +0100
+--- pcc-libs/libpcc/Makefile.in.orig	2011-02-24 13:02:15.570566278 +0100
++++ pcc-libs/libpcc/Makefile.in	2011-02-24 13:02:33.577393664 +0100
 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@
  libdir = @libdir@
  
@@ -21,8 +21,8 @@ Respect passed CFLAGS to configure and force PIC object generation.
  TARGMACH = @targmach@
  TARGOS = @targos@
  TARGET = @target@
---- libsoftfloat/Makefile.in.orig	2011-02-24 13:02:54.937188695 +0100
-+++ libsoftfloat/Makefile.in	2011-02-24 13:03:09.281050924 +0100
+--- pcc-libs/libsoftfloat/Makefile.in.orig	2011-02-24 13:02:54.937188695 +0100
++++ pcc-libs/libsoftfloat/Makefile.in	2011-02-24 13:03:09.281050924 +0100
 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@
  libdir = @libdir@
  
diff --git a/srcpkgs/pcc/patches/void.patch b/srcpkgs/pcc/patches/void.patch
index f38fbc8fded..beb390b8f1e 100644
--- a/srcpkgs/pcc/patches/void.patch
+++ b/srcpkgs/pcc/patches/void.patch
@@ -1,5 +1,5 @@
---- os/linux/ccconfig.h.orig	2019-04-21 12:16:53.029059057 +0200
-+++ os/linux/ccconfig.h	2019-04-21 12:18:19.757287684 +0200
+--- pcc/os/linux/ccconfig.h.orig	2019-04-21 12:16:53.029059057 +0200
++++ pcc/os/linux/ccconfig.h	2019-04-21 12:18:19.757287684 +0200
 @@ -39,26 +39,31 @@
  
  #if defined(mach_i386)
diff --git a/srcpkgs/pcc/patches/x86-build-fix.patch b/srcpkgs/pcc/patches/x86-build-fix.patch
index 2f4f376f1ce..3638bd37ac7 100644
--- a/srcpkgs/pcc/patches/x86-build-fix.patch
+++ b/srcpkgs/pcc/patches/x86-build-fix.patch
@@ -2,8 +2,8 @@ Fix x86 build failure: only use MULTIARCH_PATH if it's defined :-)
 
 	--xtraeme
 
---- cc/cc/cc.c.orig	2014-12-18 14:57:43.961103113 +0100
-+++ cc/cc/cc.c	2014-12-18 14:57:52.881207162 +0100
+--- pcc/cc/cc/cc.c.orig	2014-12-18 14:57:43.961103113 +0100
++++ pcc/cc/cc/cc.c	2014-12-18 14:57:52.881207162 +0100
 @@ -207,9 +207,9 @@ char *cppmdadd[] = CPPMDADD;
  #endif
  #ifndef DEFLIBDIRS	/* default library search paths */
diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template
index 718dcb7332d..84b020278d6 100644
--- a/srcpkgs/pcc/template
+++ b/srcpkgs/pcc/template
@@ -3,31 +3,75 @@ pkgname=pcc
 _snapshot=20190420
 _distver=1.1.0
 version=${_distver}.${_snapshot}
-revision=2
-wrksrc=${pkgname}-${_distver}.BETA
-build_style=gnu-configure
+revision=3
+archs="i686* x86_64*"
+create_wrksrc=yes
 configure_args="--enable-tls --enable-native"
-hostmakedepends="flex"
+hostmakedepends="flex bison"
 depends="binutils pcc-libs>=${version}"
 short_desc="Portable C Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, BSD-3-Clause, MIT, BSD-4-Clause"
 homepage="http://pcc.ludd.ltu.se/"
-distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/pcc-${_distver}.BETA-${_snapshot}.tgz"
-checksum=a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812
-nocross=1
+distfiles="
+ http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/pcc-${_distver}.BETA-${_snapshot}.tgz
+ http://pcc.ludd.ltu.se/ftp/pub/pcc-beta/pcc-libs-${_distver}.BETA-${_snapshot}.tgz"
+checksum="a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812
+ e810aa4d6683e769f490f734b13a296b33c2511ddba646bc526eb85532f1a23a"
+nocross=yes
 
 CFLAGS="-fcommon"
 
-pre_configure() {
-	vsed -i '/GNUC_MINOR/s,3,1,g' cc/cc/cc.c cc/driver/platform.c
+post_extract() {
+	mv pcc-${_distver}.BETA pcc
+	mv pcc-libs-${_distver}.BETA pcc-libs
 }
-pre_build() {
+
+post_patch() {
+	vsed -i '/GNUC_MINOR/s,3,1,g' pcc/cc/cc/cc.c pcc/cc/driver/platform.c
+}
+
+do_configure() {
+	cd $wrksrc/pcc
+	./configure ${configure_args} --libexecdir=/usr/libexec/pcc
+	cd $wrksrc/pcc-libs
+	./configure ${configure_args} CC=pcc
+}
+
+do_build() {
+	local _tmp=$wrksrc/tmp
+	mkdir -p $_tmp/usr/bin
+
+	PATH=$_tmp/usr/bin:$_tmp/usr/libexec/pcc:$PATH
+	cd $wrksrc/pcc
 	cp common/*.[ch] mip
+	make ${makejobs}
+	make DESTDIR=$_tmp install
+	cd $wrksrc/pcc-libs
+	make ${makejobs}
 }
-post_install() {
-	sed -n '2,27p' arch/i386/code.c > LICENSE
-	vlicense LICENSE
+
+do_install() {
+	cd $wrksrc/pcc
+	make DESTDIR=$DESTDIR install
+	sed -n '3,27p' arch/amd64/code.c > LICENSE.3BSD
+	sed -n '3,25p' arch/amd64/local.c > LICENSE.2BSD
+	sed -n '3,25p' arch/arm/table.c > LICENSE.MIT
+	sed -n '3,33p' arch/i386/flocal.c > LICENSE.Caldera
+	cd $wrksrc/pcc-libs
+	make DESTDIR=$DESTDIR install
 	# Rename conflicting cpp.1 manpage.
 	mv ${DESTDIR}/usr/share/man/man1/{cpp,pcc-cpp}.1
 }
+
+pcc-libs_package() {
+	short_desc+=" - libraries"
+	nodebug=yes
+	pkg_install() {
+		vmove usr/lib/pcc
+		vlicense pcc/LICENSE.3BSD
+		vlicense pcc/LICENSE.2BSD
+		vlicense pcc/LICENSE.MIT
+		vlicense pcc/LICENSE.Caldera
+	}
+}

From f2e9d0afffcdac8da9b5d3190e4e129e63620020 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 21:57:00 +0200
Subject: [PATCH 659/752] xfwm4: update to 4.16.1.

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

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index d248ea39c22..22c598246b1 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,7 +1,7 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
-version=4.16.0
-revision=3
+version=4.16.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-${version}.tar.bz2"
-checksum=1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3
+checksum=b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c
 
 post_patch() {
 	# compositor may be buggy on old and big endian hardware

From 44be1d21d12933f07a23c4c92c75c2e8849fdb8c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 21:39:57 +0200
Subject: [PATCH 660/752] catfish: update to 4.16.0.

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

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

From 1617873c28cea5ccbd75037df68bbb6f247e9d34 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Jan 2021 16:54:35 +0100
Subject: [PATCH 661/752] iana-etc: update to 20210106.

---
 srcpkgs/iana-etc/files/services | 4 ++--
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 02e8a9fe767..eff20e860d0 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -7225,8 +7225,6 @@ secure-cfg-svr   3978/tcp
 secure-cfg-svr   3978/udp
 smwan            3979/tcp
 smwan            3979/udp
-acms             3980/tcp
-acms             3980/udp
 starfish         3981/tcp
 starfish         3981/udp
 eis              3982/tcp
@@ -7663,6 +7661,7 @@ pscl-mgt         4312/tcp
 perrla           4313/tcp
 choiceview-agt   4314/tcp
 choiceview-clt   4316/tcp
+opentelemetry    4317/tcp
 fdt-rcatp        4320/tcp
 fdt-rcatp        4320/udp
 rwhois           4321/tcp
@@ -10905,6 +10904,7 @@ sxuptp          19540/udp
 jcp             19541/tcp
 jcp             19541/udp
 mle             19788/udp
+faircom-db      19790/tcp
 iec-104-sec     19998/tcp
 dnp-sec         19999/tcp
 dnp-sec         19999/udp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index 72a9075d996..5f8eacb3304 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=20201124
+version=20210106
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 441af51d1248c96583246f0b7563d31d0f9d4f73 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Jan 2021 17:06:41 +0100
Subject: [PATCH 662/752] schilytools: update to 2021.01.05.

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

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index 873ec8fb5f2..341007f35cb 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,6 +1,6 @@
 # Template file for 'schilytools'
 pkgname=schilytools
-version=2020.11.25
+version=2021.01.05
 revision=1
 wrksrc="schily-${version//./-}"
 build_style=meta
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
 homepage="https://sourceforge.net/projects/schilytools/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/schily-${version//./-}.tar.bz2"
-checksum=32aee7498f4c6dabef04107fe9b6d597688be90f4b4fae057b10776567ae4eeb
+checksum=20bfdaf57fa63b9613aa0d96f2ad0bfdf0c07722bc46f3146bac667a90e2dfe1
 nocross=yes  # configure + re-builds with itself
 
 do_build() {

From edf90f72022d9d2630af5c9177241a37197d60be Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 13 Jan 2021 18:11:07 +0100
Subject: [PATCH 663/752] New package: dumb-init-1.2.4

---
 srcpkgs/dumb-init/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/dumb-init/template

diff --git a/srcpkgs/dumb-init/template b/srcpkgs/dumb-init/template
new file mode 100644
index 00000000000..f3e5898f81e
--- /dev/null
+++ b/srcpkgs/dumb-init/template
@@ -0,0 +1,17 @@
+# Template file for 'dumb-init'
+pkgname=dumb-init
+version=1.2.4
+revision=1
+build_style=gnu-makefile
+short_desc="Minimal init system for Linux containers"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/Yelp/dumb-init"
+changelog="https://github.com/Yelp/dumb-init/releases"
+distfiles="https://github.com/Yelp/dumb-init/archive/v${version}.tar.gz"
+checksum=8834ce3a520991607e38e2df2f74624db1f28114cb670427745370fcde08cdcb
+
+do_install() {
+	vbin dumb-init
+	vlicense LICENSE
+}

From 703723813ae5b823deb6b30f28b5220e64ea3ba9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 13 Jan 2021 18:15:58 +0100
Subject: [PATCH 664/752] u-boot-tools: update to 2021.01.

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

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

From 6398c66f796808b87da5cde3904b4ce53835e4b7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <unknown>
Date: Wed, 13 Jan 2021 14:49:11 +0100
Subject: [PATCH 665/752] snapwm: update to 2.0.8

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

diff --git a/srcpkgs/snapwm/template b/srcpkgs/snapwm/template
index 95fbdf26f0b..c789d06af1d 100644
--- a/srcpkgs/snapwm/template
+++ b/srcpkgs/snapwm/template
@@ -1,16 +1,16 @@
 # Template file for 'snapwm'
 pkgname=snapwm
-version=2.0.7
+version=2.0.8
 revision=1
 wrksrc=${pkgname}-stable-${version}
 build_style=gnu-makefile
 makedepends="libX11-devel libXinerama-devel libXrandr-devel"
-short_desc="A minimal and lightweight dynamic tiling window manager"
+short_desc="Minimal and lightweight dynamic tiling window manager"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://github.com/moetunes/snapwm-stable"
 distfiles="https://github.com/moetunes/snapwm-stable/archive/v${version}.tar.gz"
-checksum=2b188563b09873f2b6fc2ac2e8b9054a6ea9c2438bacbdaf84590539cabff373
+checksum=75227f949274338094b68ca37ff99554dd9e43b0a67420f8454099b814110c72
 CFLAGS="-std=c99"
 
 post_install() {

From 83eb52688724f82a9fc55d6dc6a455d090d323f0 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 13 Jan 2021 09:01:13 +0100
Subject: [PATCH 666/752] htop: update to 3.0.5.

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

diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index d57b6323f70..2693e232c4b 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,6 +1,6 @@
 # Template file for 'htop'
 pkgname=htop
-version=3.0.4
+version=3.0.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-unicode --enable-cgroup --enable-taskstats"
@@ -12,7 +12,7 @@ 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=d8a0536ce95e3d59f8e292e73ee037033a74a8cc118fd10d22048bd4aeb61324
+checksum=4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c
 
 CFLAGS="-fcommon"
 

From ed73a12eb4bec0adbc7785c3a53ebf8a328bed35 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 13 Jan 2021 10:44:34 +0100
Subject: [PATCH 667/752] miniflux: update to 2.0.27.

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

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index a55744a2ff7..aa50315ece7 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.26
+version=2.0.27
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
 distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=c16c9386f7a7fa1f938453beaa84d5d704bb8a3e4338a09c7c56df99c776de13
+checksum=ec6696b1cf41ef50b76d02d1179838e03d9c3bcb3dce48febe2b5f4ecc450473
 system_accounts="_miniflux"
 
 post_install() {

From d8b61510922a2898328c93396a6c58752dd7638c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 13 Jan 2021 11:03:49 +0100
Subject: [PATCH 668/752] yq-go: update to 4.3.2.

---
 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 4a0f3c3fe19..7c70e6810ff 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=3.4.1
+version=4.3.2
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -9,8 +9,8 @@ short_desc="Lightweight and portable command-line YAML processor written in go"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
-distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz"
-checksum=73259f808d589d11ea7a18e4cd38a2e98b518a6c2c178d1ec57d9c5942277cb1
+distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
+checksum=7e739f3d96dfb508bf52f33741135121363cf1bf21e3a890e5d8a937877881dc
 
 do_check() {
 	go test -v

From b8ac178eb58efb2bb1b7ef02c6aa97ef68162b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 12 Jan 2021 10:50:10 +0100
Subject: [PATCH 669/752] crispy-doom: update to 5.10.0.

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

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

From 39b2d289fb712643ddec5f6c7ef1636386f86c67 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 13 Jan 2021 21:02:05 +0100
Subject: [PATCH 670/752] build-style/void-cross: explicitly enable plugins in
 binutils

this is already enabled implicitly based on checks, but might as
well make it explicit; it does not actually make any practical
difference though
---
 common/build-style/void-cross.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 5b9076d7522..e923c846025 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -67,6 +67,7 @@ _void_cross_build_binutils() {
 		--disable-werror \
 		--disable-gold \
 		--enable-relro \
+		--enable-plugins \
 		--enable-64-bit-bfd \
 		--enable-deterministic-archives \
 		--enable-default-hash-style=gnu \

From 2a86237ec8a65650d46a940822a5be4a15cfe8ad Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 12 Jan 2021 19:28:57 +1100
Subject: [PATCH 671/752] retroarch: fix typo

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 063ebf36e8c..87301c2c9ef 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -26,7 +26,7 @@ homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc noen opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
 desc_option_glslang="Enable support for GLSL shaders"

From b7acd9a176be826e3841a1363d4d1d5286ea8313 Mon Sep 17 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, 14 Jan 2021 08:05:18 +0700
Subject: [PATCH 672/752] kreport: restore loss symbol, fix ftbfs kexi

---
 srcpkgs/kreport/patches/symbol-loss.patch | 120 ++++++++++++++++++++++
 srcpkgs/kreport/template                  |   3 +-
 2 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kreport/patches/symbol-loss.patch

diff --git a/srcpkgs/kreport/patches/symbol-loss.patch b/srcpkgs/kreport/patches/symbol-loss.patch
new file mode 100644
index 00000000000..f030b675a5d
--- /dev/null
+++ b/srcpkgs/kreport/patches/symbol-loss.patch
@@ -0,0 +1,120 @@
+From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Tue, 16 Jun 2020 21:59:12 +0200
+Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
+
+BUG:422886
+CCMAIL:adam@piggz.co.uk
+
+FIXED-IN:3.2.1
+---
+ src/CMakeLists.txt                            |  5 +---
+ .../scripting/KReportGroupTracker.cpp         | 26 +++++++++++++++++++
+ src/renderer/scripting/KReportGroupTracker.h  | 25 +++++++++++++++---
+ 3 files changed, 48 insertions(+), 8 deletions(-)
+ create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1cf0b389..65bcf6e5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
+ 
+ if(KREPORT_SCRIPTING)
+     list(APPEND kreport_LIB_SRCS
++        renderer/scripting/KReportGroupTracker.cpp
+         renderer/scripting/KReportScriptHandler.cpp
+         renderer/scripting/KReportScriptConstants.cpp
+         renderer/scripting/KReportScriptDebug.cpp
+@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
+         items/text/KReportScriptText.cpp
+     )
+ 
+-    qt_wrap_cpp(KReport kreport_LIB_SRCS
+-        renderer/scripting/KReportGroupTracker.h
+-    )
+-
+     list(APPEND kreport_INCLUDE_DIRS
+         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
+     )
+diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
+new file mode 100644
+index 00000000..9274d4a5
+--- /dev/null
++++ b/src/renderer/scripting/KReportGroupTracker.cpp
+@@ -0,0 +1,26 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "KReportGroupTracker.h"
++
++KReportGroupTracker::KReportGroupTracker()
++{
++}
++
++KReportGroupTracker::~KReportGroupTracker()
++{
++}
+diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
+index e434e05a..4c0852ea 100644
+--- a/src/renderer/scripting/KReportGroupTracker.h
++++ b/src/renderer/scripting/KReportGroupTracker.h
+@@ -1,3 +1,20 @@
++/* This file is part of the KDE project
++ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
+ #ifndef KREPORTGROUPTRACKER_H
+ #define KREPORTGROUPTRACKER_H
+ 
+@@ -7,16 +24,16 @@
+ /*!
+  * @brief Keeps track of groups as the data for the group changes
+  */
+-class KREPORT_EXPORT KReportGroupTracker : public QObject {
++class KREPORT_EXPORT KReportGroupTracker : public QObject
++{
+     Q_OBJECT
+ 
+ protected:
+-    KReportGroupTracker() {}
+-    ~KReportGroupTracker() override{}
++    KReportGroupTracker();
++    ~KReportGroupTracker() override;
+ 
+ public:
+     Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
+ };
+ 
+ #endif // KREPORTGROUPTRACKER_H
+-
+-- 
+2.29.2
+
diff --git a/srcpkgs/kreport/template b/srcpkgs/kreport/template
index 71eedf2144e..2dade86a8f4 100644
--- a/srcpkgs/kreport/template
+++ b/srcpkgs/kreport/template
@@ -1,7 +1,7 @@
 # Template file for 'kreport'
 pkgname=kreport
 version=3.2.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kcoreaddons"
 makedepends="ecm-devel kconfig-devel kcoreaddons-devel kguiaddons-devel kproperty-devel
@@ -12,6 +12,7 @@ license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KReport"
 distfiles="${KDE_SITE}/kreport/src/kreport-${version}.tar.xz"
 checksum=22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7
+patch_args=-Np1
 
 kreport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} kproperty-devel qt5-declarative-devel"

From 2308b88f52b1e7b4111dbc0700915755ae75e378 Mon Sep 17 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, 14 Jan 2021 08:20:38 +0700
Subject: [PATCH 673/752] Rebase OpenCoarray to a single commit

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

diff --git a/srcpkgs/parrot/template b/srcpkgs/parrot/template
index 55472a9726c..ec36cbd2afd 100644
--- a/srcpkgs/parrot/template
+++ b/srcpkgs/parrot/template
@@ -7,7 +7,7 @@ configure_args="--prefix=/usr --mandir=/usr/share/man"
 short_desc="Virtual machine designed for dynamic languages"
 maintainer="pancake <pancake@nopcode.org>"
 homepage="http://www.parrot.org"
-hostmakedepends="perl"
+hostmakedepends="perl perl-Pod-Parser"
 configure_script="perl Configure.pl"
 license="Artistic"
 distfiles="ftp://ftp.parrot.org/pub/parrot/releases/supported/${version}/parrot-${version}.tar.bz2"

From 183d5c5230df8f2b2d4a7bff0cc79924f2a48b33 Mon Sep 17 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, 14 Jan 2021 08:26:04 +0700
Subject: [PATCH 674/752] vte290: fix l10n dir

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

diff --git a/srcpkgs/vte290/template b/srcpkgs/vte290/template
index 2d1922b505e..c030b2c06b4 100644
--- a/srcpkgs/vte290/template
+++ b/srcpkgs/vte290/template
@@ -1,7 +1,7 @@
 # Template file for 'vte290'
 pkgname=vte290
 version=0.36.5
-revision=4
+revision=5
 wrksrc=vte-${version}
 build_style=gnu-configure
 build_helper="gir"
@@ -23,6 +23,10 @@ CFLAGS="-D_GNU_SOURCE"
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+}
+
 post_install() {
 	# Rename conflicting file
 	mv ${DESTDIR}/etc/profile.d/{vte,vte290}.sh

From 3b42ccb4cb00df459817c8edc3185b0d7d0e432a Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Wed, 13 Jan 2021 22:10:04 +0100
Subject: [PATCH 675/752] alacritty: update to 0.7.1.

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

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 673e345a348..0604f7bdc92 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.7.0
+version=0.7.1
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b9b7e96ebc1725962de628dac7d7bc0766ff9aea5f4c09f399e95823369d5882
+checksum=90dc5cd49bf0bb01a3202de2170ba376f9530aa265a939f6b3af3d30f8361f50
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 04d26ab5c23914666da8c978f90de75667d93e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 13 Jan 2021 01:55:11 -0300
Subject: [PATCH 676/752] doxygen: update to 1.9.1.

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

diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 9fe4729644b..ea22d0d43a6 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,7 +1,7 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.8.20
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
 hostmakedepends="perl python3 flex"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec
+checksum=67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From e64e09576906dc48b9548cffe27f46e18897efb0 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Wed, 13 Jan 2021 09:02:59 -0800
Subject: [PATCH 677/752] vault: update to 1.6.1

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

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 5b34538ad0c..edfa5c95a91 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.5.4
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
 go_build_tags="release"
-_git_commit=e16495da552c996068e05574cddf69875199f949
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,11 +13,15 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz"
-checksum=99e3145a9b6f5ee6429b997f3e1f35f648d07c617ff6aef7041f91fcf34e1582
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*) go_ldflags="$go_ldflags -linkmode=external";;
+esac
+
 post_install() {
 	vlicense LICENSE
 	vsv vault

From 285a2ad381aa634bd0e36dfe5d6589a36184e7aa Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 14 Jan 2021 10:08:03 +0100
Subject: [PATCH 678/752] cmake: update to 3.19.3.

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

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index d88833bb472..b5289095e4a 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.19.2
+version=3.19.3
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -15,7 +15,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732
 
 pre_check() {
 	# use ctest of this build instead of requirig cmake to test cmake...

From f1db9143d54c18d102a6a45f666faf7df05ffe2d Mon Sep 17 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, 14 Jan 2021 08:42:30 +0700
Subject: [PATCH 679/752] roccat-tools: fix ftbfs, make_dirs

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

diff --git a/srcpkgs/roccat-tools/template b/srcpkgs/roccat-tools/template
index 070b9305bcf..f753744458d 100644
--- a/srcpkgs/roccat-tools/template
+++ b/srcpkgs/roccat-tools/template
@@ -1,13 +1,12 @@
 # Template file for 'roccat-tools'
 pkgname=roccat-tools
 version=5.8.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DDEVICES=arvo;isku;iskufx;kiro;kone;koneplus;konepure;konepuremilitary;konepureoptical;konextd;konextdoptical;kovaplus;kova2016;lua;nyth;pyra;ryosmk;ryosmkfx;ryostkl;savu;skeltr;sova;suora;tyon
  -DWITH_LUA=5.3 -DUDEVDIR=/usr/lib/udev/rules.d
  -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/lib/cmake"
-make_dirs="/var/lib/roccat 2770 root roccat"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="lua53-devel gtk+-devel libgaminggear-devel dbus-glib-devel
  libgudev-devel"
@@ -18,8 +17,9 @@ homepage="https://roccat.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/roccat/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=181178da305e82267e45bcc6577dc03387322303b8c341be33e574afdf8a213b
 system_groups="_roccat"
+make_dirs="/var/lib/roccat 2770 root _roccat"
 
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -I$XBPS_CROSS_BASE/usr/include/harfbuzz"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus-glib-devel"

From 965399fd15c2a143960247ae78cb3c208752e65f Mon Sep 17 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, 14 Jan 2021 08:35:01 +0700
Subject: [PATCH 680/752] stockfish: use upstream's cxxflags, fix ftbfs

---
 srcpkgs/stockfish/patches/makefile.patch | 33 ++++++++++++++++++------
 srcpkgs/stockfish/template               |  9 +++++--
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch
index 00b7ef3c84b..b5fc75e7a0a 100644
--- a/srcpkgs/stockfish/patches/makefile.patch
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -1,12 +1,29 @@
---- src/Makefile.orig
-+++ src/Makefile
-@@ -159,9 +159,6 @@
- 			CXXFLAGS += -m$(bits)
- 			LDFLAGS += -m$(bits)
- 		endif
+--- src/Makefile.orig	2020-09-02 21:19:30.000000000 +0700
++++ src/Makefile	2021-01-14 18:51:25.852600109 +0700
+@@ -306,26 +306,7 @@
+ 
+ ifeq ($(COMP),gcc)
+ 	comp=gcc
+-	CXX=g++
+ 	CXXFLAGS += -pedantic -Wextra -Wshadow
+-
+-	ifeq ($(arch),$(filter $(arch),armv7 armv8))
+-		ifeq ($(OS),Android)
+-			CXXFLAGS += -m$(bits)
+-			LDFLAGS += -m$(bits)
+-		endif
 -	else
 -		CXXFLAGS += -m$(bits)
 -		LDFLAGS += -m$(bits)
- 	endif
+-	endif
+-
+-	ifeq ($(arch),$(filter $(arch),armv7))
+-		LDFLAGS += -latomic
+-	endif
+-
+-	ifneq ($(KERNEL),Darwin)
+-	   LDFLAGS += -Wl,--no-as-needed
+-	endif
+ endif
  
- 	ifneq ($(KERNEL),Darwin)
+ ifeq ($(COMP),mingw)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 8e0225e0df7..99d3e95e6f5 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,12 +1,13 @@
 # Template file for 'stockfish'
 pkgname=stockfish
 version=12
-revision=1
+revision=2
 _net_file=nn-82215d0fd0df.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_build_target=build
+make_use_env=yes
 hostmakedepends="tar"
 short_desc="Free UCI chess engine derived from Glaurung"
 maintainer="cipr3s <cipr3s@gmx.com>"
@@ -20,14 +21,18 @@ skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"
 
+# We know how to optimize ourselves
+make_build_args="optimize=no "
+
 case $XBPS_TARGET_MACHINE in
 	x86_64*) make_build_args+="ARCH=x86-64" ;;
 	i686*) make_build_args+="ARCH=x86-32" ;;
-	aarch64*) make_build_args+="ARCH=general-64" ;;
+	aarch64*) make_build_args+="ARCH=armv8" ;;
 	armv[56]*) make_build_args+="ARCH=general-32";;
 	armv7*) make_build_args+="ARCH=armv7" ;;
 	ppc64*) make_build_args+="ARCH=ppc-64" ;;
 	ppc*) make_build_args+="ARCH=ppc-32" ;;
+	*) broken="not supported" ;;
 esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 0225b6777aa22de2742960bbe209af71b13a8edb Mon Sep 17 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, 14 Jan 2021 19:17:29 +0700
Subject: [PATCH 681/752] kakoune: use project's cxxflags

Not sure if it should warrant a rebuild but this package is cheap to be
built.
---
 srcpkgs/kakoune/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index 934795a45f6..4f308a8c698 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -2,11 +2,12 @@
 pkgname=kakoune
 reverts=20180409_1
 version=2020.09.01
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
-make_build_args="debug=no"
-make_install_args="debug=no"
+make_build_args="debug=no gzip_man=no"
+make_install_args="debug=no gzip_man=no"
+make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Selection-based vim-like editor with less keystrokes"
@@ -15,3 +16,7 @@ license="Unlicense"
 homepage="https://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
 checksum=861a89c56b5d0ae39628cb706c37a8b55bc289bfbe3c72466ad0e2757ccf0175
+
+post_patch() {
+	vsed -i -e 's/-O3//' Makefile
+}

From 696d62fadd44ce8e97362c99b6c4eb66ada03fe0 Mon Sep 17 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, 14 Jan 2021 20:27:15 +0700
Subject: [PATCH 682/752] mpdas: fix ftbfs

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

diff --git a/srcpkgs/mpdas/template b/srcpkgs/mpdas/template
index 495033d8d19..4e64f1f8fdf 100644
--- a/srcpkgs/mpdas/template
+++ b/srcpkgs/mpdas/template
@@ -1,15 +1,16 @@
 # Template file for 'mpdas'
 pkgname=mpdas
 version=0.4.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr CONFIG=/etc"
 make_install_args="MANPREFIX=/usr/share/man/man1"
+make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libmpdclient-devel libcurl-devel"
 short_desc="MPD AudioScrobbler written in C++ using libcurl"
 maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://50hz.ws/mpdas/"
 distfiles="https://github.com/hrkfdn/mpdas/archive/${version}.tar.gz"
 checksum=c9103d7b897e76cd11a669e1c062d74cb73574efc7ba87de3b04304464e8a9ca

From c323a398e1b204df39cbf58e906b3e34ab4d4ecd Mon Sep 17 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, 14 Jan 2021 20:34:37 +0700
Subject: [PATCH 683/752] ponymix: make use env, fix ftbfs

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

diff --git a/srcpkgs/ponymix/template b/srcpkgs/ponymix/template
index 772c201e548..56db91f5a8a 100644
--- a/srcpkgs/ponymix/template
+++ b/srcpkgs/ponymix/template
@@ -3,6 +3,7 @@ pkgname=ponymix
 version=5
 revision=1
 build_style=gnu-makefile
+make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="pulseaudio-devel libnotify-devel"
 short_desc="CLI volume control for PulseAudio"

From 52045e2cad551b801a771af3e6b4d3411a25e1c0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 13 Jan 2021 18:34:12 +0100
Subject: [PATCH 684/752] keepassxc: update to 2.6.3.

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

diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index b560bbb81a1..7778193f5fb 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,6 +1,6 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.6.2
+version=2.6.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
@@ -25,7 +25,7 @@ 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/blob/${version}/CHANGELOG.md"
 distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=101bfade0a760d6ec6b8c4f3556e7f1201f1edd29ceabc73ad5846f9a57d7e38
+checksum=e7e0b6ed8f3881c5b9579074bc3cde3991b28c1a3d1c852c46f2b7930a10f7d1
 
 # https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
 build_options="autotype browser fdosecrets keeshare network sshagent yubikey"

From 4731267aaabac1113473332b3b4953a5b7310d4a Mon Sep 17 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, 14 Jan 2021 20:46:16 +0700
Subject: [PATCH 685/752] reminiscence: fix ftbfs

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

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
index 30e1d7b0123..33a2d85e828 100644
--- a/srcpkgs/reminiscence/template
+++ b/srcpkgs/reminiscence/template
@@ -4,6 +4,7 @@ version=0.4.6
 revision=1
 wrksrc="REminiscence-${version}"
 build_style=gnu-makefile
+make_use_env=yes
 makedepends="zlib-devel libmodplug-devel SDL2-devel"
 short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ca13fe87d2169c4727130b5234019fa5605e6ed0 Mon Sep 17 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, 14 Jan 2021 20:46:35 +0700
Subject: [PATCH 686/752] reminiscence: remove package

- The last GPLv3 version was 0.2.1 or so (Debian has this version)
- Our current version doesn't have any license, only Copyright notice,
  let's not play the politic game.
---
 srcpkgs/reminiscence/template | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 srcpkgs/reminiscence/template

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
deleted file mode 100644
index 33a2d85e828..00000000000
--- a/srcpkgs/reminiscence/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'reminiscence'
-pkgname=reminiscence
-version=0.4.6
-revision=1
-wrksrc="REminiscence-${version}"
-build_style=gnu-makefile
-make_use_env=yes
-makedepends="zlib-devel libmodplug-devel SDL2-devel"
-short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="http://cyxdown.free.fr/reminiscence/"
-distfiles="http://cyxdown.free.fr/reminiscence/REminiscence-${version}.tar.bz2"
-checksum=a1738ca7df64cd34e75a0ada3110e70ed495260fda813bc9d8722b521fc6fee0
-
-pre_build() {
-	vsed -e 's,-DUSE_TREMOR,,' -i Makefile
-	vsed -e '/LIBS =/s/$(TREMOR_LIBS)//' -i Makefile
-}
-
-do_install() {
-	vbin rs ${pkgname}
-	vdoc README.txt
-}

From f3bf5dadea24f643bd6aa8df6cb786710a1292f2 Mon Sep 17 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, 14 Jan 2021 21:47:48 +0700
Subject: [PATCH 687/752] xava: fix ftbfs for cross build

---
 srcpkgs/xava/patches/broken-cmake.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/xava/patches/broken-cmake.patch

diff --git a/srcpkgs/xava/patches/broken-cmake.patch b/srcpkgs/xava/patches/broken-cmake.patch
new file mode 100644
index 00000000000..ea0775a84fe
--- /dev/null
+++ b/srcpkgs/xava/patches/broken-cmake.patch
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2020-08-27 15:31:42.000000000 +0700
++++ CMakeLists.txt	2021-01-14 21:44:51.704505119 +0700
+@@ -10,19 +10,6 @@
+ option(SNDIO "SNDIO" ON)
+ option(PORTAUDIO "PORTAUDIO" ON)
+ 
+-# Fix pkg-config for cross-builds (such as MinGW on ArchLinux)
+-if(CMAKE_FIND_ROOT_PATH)
+-    set(CMAKE_SYSROOT "${CMAKE_FIND_ROOT_PATH}")
+-
+-    set(ENV{PKG_CONFIG_DIR} "")
+-    set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig")
+-    set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT})
+-endif()
+-
+-if(NOT CMAKE_BUILD_TYPE)
+-	set(CMAKE_BUILD_TYPE Debug)
+-endif()
+-
+ set(CMAKE_C_STANDARD 11)
+ set(xava_VERSION_MAJOR 0)
+ set(xava_VERSION_MINOR 6)

From ab442be154b9d2774f35c3777bc3fd687f84172f Mon Sep 17 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, 14 Jan 2021 21:54:45 +0700
Subject: [PATCH 688/752] upx: fix ftbfs

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

diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template
index d2f7292352e..c562348651d 100644
--- a/srcpkgs/upx/template
+++ b/srcpkgs/upx/template
@@ -6,6 +6,7 @@ wrksrc="upx-${version}-src"
 build_style=gnu-makefile
 make_build_target=all
 make_build_args="CHECK_WHITESPACE=:"
+make_use_env=yes
 hostmakedepends="perl"
 makedepends="ucl zlib-devel"
 short_desc="Ultimate Packer for eXecutables"

From db6c0342ae37c4819ab01597dcd41c5985286519 Mon Sep 17 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, 14 Jan 2021 21:58:24 +0700
Subject: [PATCH 689/752] Revert "reminiscence: remove package"

This reverts commit 6f74e7a539efd6416c9d1d63b5ff6c028403eafa.

Didn't mean to push this out, was rfc.
---
 srcpkgs/reminiscence/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/reminiscence/template

diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
new file mode 100644
index 00000000000..33a2d85e828
--- /dev/null
+++ b/srcpkgs/reminiscence/template
@@ -0,0 +1,24 @@
+# Template file for 'reminiscence'
+pkgname=reminiscence
+version=0.4.6
+revision=1
+wrksrc="REminiscence-${version}"
+build_style=gnu-makefile
+make_use_env=yes
+makedepends="zlib-devel libmodplug-devel SDL2-devel"
+short_desc="Rewrite of the engine used in the game Flashback from Delphine Software"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3"
+homepage="http://cyxdown.free.fr/reminiscence/"
+distfiles="http://cyxdown.free.fr/reminiscence/REminiscence-${version}.tar.bz2"
+checksum=a1738ca7df64cd34e75a0ada3110e70ed495260fda813bc9d8722b521fc6fee0
+
+pre_build() {
+	vsed -e 's,-DUSE_TREMOR,,' -i Makefile
+	vsed -e '/LIBS =/s/$(TREMOR_LIBS)//' -i Makefile
+}
+
+do_install() {
+	vbin rs ${pkgname}
+	vdoc README.txt
+}

From 45ce6584e74842231e8fff59041c3c90a0404c4f Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Tue, 5 Jan 2021 23:15:47 +0100
Subject: [PATCH 690/752] pipewire: update to 0.3.19

* add ncurses makedep for pw-top
---
 srcpkgs/pipewire/INSTALL.msg            |  3 +++
 srcpkgs/pipewire/patches/ncursesw.patch | 11 +++++++++++
 srcpkgs/pipewire/template               |  6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pipewire/INSTALL.msg
 create mode 100644 srcpkgs/pipewire/patches/ncursesw.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
new file mode 100644
index 00000000000..f7c4437683d
--- /dev/null
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -0,0 +1,3 @@
+WARNING: pipewire>=0.3.19 changed the config file format. If
+you edited /etc/pipewire/pipewire.conf you must recreate it from
+/etc/pipewire/pipewire.conf.new-0.3.19_1 with your changes on top.
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
new file mode 100644
index 00000000000..92598546b11
--- /dev/null
+++ b/srcpkgs/pipewire/patches/ncursesw.patch
@@ -0,0 +1,11 @@
+--- meson.build.orig	2021-01-05 18:40:24.345620177 +0100
++++ meson.build	2021-01-05 18:40:43.209619527 +0100
+@@ -325,7 +325,7 @@
+ pthread_lib = dependency('threads')
+ dbus_dep = dependency('dbus-1')
+ sdl_dep = dependency('sdl2', required : false)
+-ncurses_dep = dependency('ncurses', required : false)
++ncurses_dep = dependency('ncursesw', required : false)
+ sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false)
+ 
+ if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index bd2bafdada7..7ad025fa5a5 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.18
+version=0.3.19
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
@@ -8,7 +8,7 @@ configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel"
+ sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=a7317de8e54f57190a2e2fe5f469ed332b9a12151fade03bf984765a55e5e24b
+checksum=de2e757a57ff313362341f4b18b976c707d397d853c0cd2032975b76d0c540dc
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"

From 5ecfa6c2c9261f018dd770aa111cf90d0b8c6bf2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Jan 2021 16:39:26 +0100
Subject: [PATCH 691/752] python3-boto3: update to 1.16.54.

---
 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 eb982f6ff10..b3a17ca435b 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.16.51
+version=1.16.54
 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=95160b45df095801b4551f76dbd46496a587effe1e10890ab355be564d67a334
+checksum=29b031327dcd60cbb2eabe704ee7e4f0184513b85645057241fc0af16acae412
 
 post_install() {
 	vlicense LICENSE

From 6ea051b5ca6ad3150a75033a979c021d360f3d49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Jan 2021 16:39:29 +0100
Subject: [PATCH 692/752] snooze: update to 0.5.

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

diff --git a/srcpkgs/snooze/template b/srcpkgs/snooze/template
index 4b5d9a27140..a38900dd41c 100644
--- a/srcpkgs/snooze/template
+++ b/srcpkgs/snooze/template
@@ -1,6 +1,6 @@
 # Template file for 'snooze'
 pkgname=snooze
-version=0.4
+version=0.5
 revision=1
 build_style=gnu-makefile
 short_desc="Run a command at a particular time"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/leahneukirchen/snooze"
 distfiles="https://github.com/leahneukirchen/snooze/archive/v${version}.tar.gz"
-checksum=1d1dc49edb3a96ddc6411b19e40e665dae47489fcc73465dd254e31816ca8eb0
+checksum=d63fde85d9333188bed5996baabd833eaa00842ce117443ffbf8719c094be414
 
 post_install() {
 	make -C sv install DESTDIR="$DESTDIR"

From 48d8e6d537cbc685bae294b24562577c661cd5d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Jan 2021 16:49:08 +0100
Subject: [PATCH 693/752] mblaze: update to 1.1.

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

diff --git a/srcpkgs/mblaze/template b/srcpkgs/mblaze/template
index f2f5c426bfb..88624be8f71 100644
--- a/srcpkgs/mblaze/template
+++ b/srcpkgs/mblaze/template
@@ -1,6 +1,6 @@
 # Template file for 'mblaze'
 pkgname=mblaze
-version=1.0
+version=1.1
 revision=1
 build_style=gnu-makefile
 checkdepends="perl"
@@ -9,13 +9,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain, MIT"
 homepage="https://github.com/leahneukirchen/mblaze"
 distfiles="https://leahneukirchen.org/releases/${pkgname}-${version}.tar.gz"
-checksum=316061e8d6cf6455a91105c550669638f6e0288c53c7185fb2429c54e80f2335
+checksum=edd8cb86f667543e703dee58263b81c7e47744339d23ebbb6a43e75059ba93b1
 
 post_install() {
 	vbin contrib/mcount
 	vbin contrib/mencrypt
 	vbin contrib/menter
 	vbin contrib/mgpg
+	vbin contrib/mmailto
 	vbin contrib/mp7m
 	vbin contrib/mraw
 	vbin contrib/mrecode

From bef203aa8f896cbe990f30741db79ae53e9ebd0c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 14 Jan 2021 17:04:19 +0100
Subject: [PATCH 694/752] linux5.4: update to 5.4.89.

---
 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 5b0b52acfbe..35de1cf56c2 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.87
+version=5.4.89
 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=6a34e93e2e84bb645155124962307ad9d3646124f43838d087209ed4ea595c31
+checksum=268dd5177b6df1867d4ed2452ffb11a016d955c43aba5e07940886f347ab0aaf
 python_version=3
 patch_args="-Np1"
 

From 252f315b981f7ebf63ddc6e092fb65ce7457ddef Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 14 Jan 2021 17:05:42 +0100
Subject: [PATCH 695/752] linux4.19: update to 4.19.167.

---
 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 de6b8cff724..93d5896f818 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.165
+version=4.19.167
 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=a1c05649b0f28d041c34d09d710d2d18f83d42fea4eb90569320d216d4e4e2d0
+checksum=312c67677c75adc4324078c5afb11411df379d5573ad0a429b3f4919f26bed01
 python_version=2 #unverified
 patch_args="-Np1"
 

From 4924a58f1d49bfb9a87c664021573537f5b6d0fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 14 Jan 2021 17:26:04 +0100
Subject: [PATCH 696/752] xinetd: use libtirpc

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

diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template
index 9d71592b6e7..dbdd441c063 100644
--- a/srcpkgs/xinetd/template
+++ b/srcpkgs/xinetd/template
@@ -1,9 +1,10 @@
 # Template file for 'xinetd'
 pkgname=xinetd
 version=2.3.15
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--without-libwrap"
+makedepends="libtirpc-devel"
 short_desc="A secure replacement for inetd"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="xinetd"
@@ -13,11 +14,13 @@ checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
 
 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) export CFLAGS+=" -DNO_RPC"; configure_args+=" xinetd_cv_type_rlim_t=yes";;
-	esac
-}
+CFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/tirpc"
+LDFLAGS=" -ltirpc"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" xinetd_cv_type_rlim_t=yes"
+fi
+
 do_install() {
 	make prefix=${DESTDIR}/usr DAEMONDIR=${DESTDIR}/usr/bin MANDIR=${DESTDIR}/usr/share/man install
 

From b394a4c25060507c8c81838d93c2cdefc7a8c9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 14 Jan 2021 18:40:19 +0100
Subject: [PATCH 697/752] so: update to 0.4.3.

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

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index bf59d26630c..ecdbb5331ee 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,6 +1,6 @@
 # Template file for 'so'
 pkgname=so
-version=0.4.2
+version=0.4.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/samtay/so"
 distfiles="https://github.com/samtay/so/archive/v${version}.tar.gz"
-checksum=402d3a07283375d92892802544481a417f9d017b5e80733183ccbce3a810ef84
+checksum=4e82cb8f6d31435eec03a74d0ea4297eb28ce3ee75d4612ca5b2233c27e19c2d
 
 post_install() {
 	vlicense LICENSE

From eed3e93b9d1dedd7862a2a54e66df3c568f7ca59 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH 698/752] wine: Add wine-staging patchset as a (non-default)
 build option

closes #27612
---
 srcpkgs/wine/template | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..36e99f6fafb 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,25 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+_pkgver=${version/r/-r}
+create_wrksrc=yes
+build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
+ https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ 9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +33,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -64,6 +70,12 @@ if [ "${_nopie}" = yes ]; then
 	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
 fi
 
+post_patch() {
+	if [ "${build_option_staging}" ]; then
+		"../wine-staging-${_pkgver}/patches/patchinstall.sh" --all
+	fi
+}
+
 pre_build() {
 	if [ "${_nopie}" = yes ]; then
 		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \

From 2c753acfbd6bef43117eaab4d18d4a3f89ac6e5b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 14 Jan 2021 19:29:01 +0100
Subject: [PATCH 699/752] mesa-demos: fix DEMOS_DATA_DIR

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

diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index a10713008e1..6a6974d5f37 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,8 +1,9 @@
 # Template file for 'mesa-demos'
 pkgname=mesa-demos
 version=8.4.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-system-data-files"
 hostmakedepends="pkg-config"
 makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
 short_desc="Mesa 3D demos and tools"

From 71c21e3f434a226823afec31cd9d8f4e68dd3ffc Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 13 Jan 2021 21:17:58 -0700
Subject: [PATCH 700/752] phpMyAdmin: update to 5.0.4, fix license

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

diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 12cb1d5e4c4..a55d2b5dfe2 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,16 +1,16 @@
 # Template file for 'phpMyAdmin'
 pkgname=phpMyAdmin
-version=5.0.2
-revision=2
+version=5.0.4
+revision=1
 wrksrc="phpMyAdmin-${version}-all-languages"
 conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
 depends="php mysql"
 short_desc="Web interface for MySQL and MariaDB"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
 homepage="https://www.phpmyadmin.net"
 distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=cbcc78d1499308d9329950fcba2ebaa84c559a934fe54efc027d459d8e4161c8
+checksum=1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db
 
 do_install() {
 	vmkdir usr/share/webapps/

From 6d94358e88a0a082d83a13141f82955082f7fe59 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 14:56:46 -0600
Subject: [PATCH 701/752] wine: update to 6.0.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 36e99f6fafb..e8b1fda250c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.0rc6
-revision=2
+version=6.0
+revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
- 9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13"
+checksum="b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56
+ 194902cb880a657de386e0789f8ce1f369fb896468ca299fd5abbe921fee043c"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 7ce83a0ffe21f2694b2d75c035cd5432d780217f Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 14 Jan 2021 14:20:29 -0700
Subject: [PATCH 702/752] fonts-nanum-ttf: update to 20200506.

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

diff --git a/srcpkgs/fonts-nanum-ttf/template b/srcpkgs/fonts-nanum-ttf/template
index 3bba3856b17..fab4809376e 100644
--- a/srcpkgs/fonts-nanum-ttf/template
+++ b/srcpkgs/fonts-nanum-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'fonts-nanum-ttf'
 pkgname=fonts-nanum-ttf
-version=20180306
-revision=2
+version=20200506
+revision=1
 wrksrc=${pkgname%-*}-${version}
 depends="font-util"
 short_desc="Nanum Korean fonts"
@@ -9,7 +9,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="OFL-1.1"
 homepage="https://hangeul.naver.com/2017/nanum"
 distfiles="${DEBIAN_SITE}/main/f/${pkgname%-*}/${pkgname%-*}_${version}.orig.tar.xz"
-checksum=2761e62f3f3f500c7a50d40d5ee8bbd87abe22ab42a78df0496cf80c95fec6f0
+checksum=157803748198151250a3cf7cb03aef844e408e9c98849dd889e191846aacad4b
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {

From 738e97d1ff343541aeba61f05f1eb092270e7077 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <unknown>
Date: Wed, 13 Jan 2021 13:57:16 +0100
Subject: [PATCH 703/752] font-unifont-bdf: update to 13.0.05

---
 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 3b8eac00a01..6f65dba0bad 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=13.0.04
+version=13.0.05
 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=5319d51779aa23e206268e6e6de71bb67b983033468d2c815118aecf5f7d57c0
+checksum=c4e61e9336d8d024479ea72616722c6c47c93f76dc173e8ad3edf9f9e07c3115
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From cd04f1b21de5899ade3e2a2e1c37d809bd1f73fd Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 12 Jan 2021 10:49:09 +0400
Subject: [PATCH 704/752] calibre: update to 5.9.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 4d430e615a3..738dfda3d51 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.8.1
+version=5.9.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.yaml"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=23910db4cff74236f489a9720ad45a30afd1eb09dd05e944f383b1b3ac9d514e
+checksum=a71196af15372054c4a25697534a2df1ef6dd732b9db07aaecaac7a86d9b3a0a
 lib32disabled=yes
 nocross=yes
 

From 7e6f6c1a847e6bfe9d52fa41677b18de6cfe9bac Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 2 Jan 2021 15:58:31 -0700
Subject: [PATCH 705/752] yambar: update to 1.6.1.

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

diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index b558e6081ed..c880328f2d5 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,6 +1,6 @@
 # Template file for 'yambar'
 pkgname=yambar
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/yambar"
 changelog="https://codeberg.org/dnkl/yambar/raw/branch/master/CHANGELOG.md"
 distfiles="https://codeberg.org/dnkl/yambar/archive/${version}.tar.gz"
-checksum=143c09b256d3c042e908fd1b658fc513b476af780c213dc621cbeff2526a1e7a
+checksum=9ddf0bd7a708445697b4bf2f1d6d0fe5c29c5c7cd6df6058a739fe89413bd2c7
 
 do_check() {
 	xvfb-run ninja -C build/ test

From 3ede80b6333237e7ab4e6a25788dbd0e7cdd3631 Mon Sep 17 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, 14 Jan 2021 20:20:55 +0700
Subject: [PATCH 706/752] mpc-qt: fix ftbfs

Fetch the latest version of qthelper.hpp from mpv.
See https://github.com/mpv-player/mpv/commit/575197ff8b0a0d8cd14f7ee78461c1d61d045d72
---
 srcpkgs/mpc-qt/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mpc-qt/template b/srcpkgs/mpc-qt/template
index 182072df113..28651df5cf4 100644
--- a/srcpkgs/mpc-qt/template
+++ b/srcpkgs/mpc-qt/template
@@ -4,16 +4,21 @@ version=18.08
 revision=1
 build_style=qmake
 configure_args="MPCQT_VERSION=${version}"
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-x11extras-devel"
 makedepends="qt5-devel qt5-x11extras-devel mpv-devel"
 short_desc="Clone of Media Player Classic reimplemented in Qt"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/cmdrkotori/mpc-qt"
 #distfiles="${homepage}/archive/v${version}.tar.gz"
-distfiles="https://sources.voidlinux.org/mpc-qt-18.08/v18.08.tar.gz"
-checksum=c58fd90926773c9da8bdfc1a8e4dba0b95cbc58cee6db9981e8de94fd9534406
+# https://github.com/mpv-player/mpv/commit/575197ff8b0a0d8cd14f7ee78461c1d61d045d72
+distfiles="https://sources.voidlinux.org/mpc-qt-18.08/v18.08.tar.gz
+ https://raw.githubusercontent.com/mpv-player/mpv/2337fa4e0213993398d36cb3222633766d677dfd/libmpv/qthelper.hpp"
+checksum="c58fd90926773c9da8bdfc1a8e4dba0b95cbc58cee6db9981e8de94fd9534406
+ 86e1fcba6001829b7e23a856db84d01ebc76e63528f74064d7bc5705015a2684"
+skip_extraction="qthelper.hpp"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
+post_extract() {
+	mkdir -p mpv
+	cp $XBPS_SRCDISTDIR/mpc-qt-$version/qthelper.hpp mpv/
+}

From 7b6a6a2be5c81f1b4a992e7bec12badc14e12c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 08:42:40 +0100
Subject: [PATCH 707/752] python-reportlab: fix cross

---
 srcpkgs/python-reportlab/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template
index 4fcb53f8a79..65ad7fdd8db 100644
--- a/srcpkgs/python-reportlab/template
+++ b/srcpkgs/python-reportlab/template
@@ -14,6 +14,10 @@ homepage="https://www.reportlab.com/"
 distfiles="${PYPI_SITE}/r/reportlab/reportlab-${version}.tar.gz"
 checksum=9c21f202697a6cea57b9d716288fc919d99cbabeb30222eebfc7ff77eac32744
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" ${makedepends}"
+fi
+
 post_install() {
 	vlicense LICENSE.txt
 }

From 3679558359f5afd2ba622c3c82d6fa5609033cb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Jan 2021 13:56:00 +0100
Subject: [PATCH 708/752] ugrep: update to 3.1.3.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 7931ca3c836..2eedab2d46e 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
@@ -10,4 +10,4 @@ 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=81de520a6db437455e8ae9ee4abbdc9dc875328a359b8620ef296bb8d8364310
+checksum=6416e06d1358316aafa147aa74e5bc7d05502f1d78d742248b3fdce0f6fbeae1

From 686badfc4639db7802019f216db85a2dc5152818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 14:37:33 +0100
Subject: [PATCH 709/752] oh: update to 0.7.0

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

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index 9dbacc5b1c1..9c52bb9cd14 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,6 +1,6 @@
 # Template file for 'oh'
 pkgname=oh
-version=0.4.8.16
+version=0.7.0
 revision=1
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="MIT"
 homepage="https://github.com/michaelmacinnis/oh"
 distfiles="https://github.com/michaelmacinnis/oh/archive/v${version}.tar.gz"
-checksum=fa1d7e8860eea443177ef43c30b355deb88871d2dae6bb17057eeeea7d808d63
+checksum=476b0bba7f77f2b276279f4b997ed69abc4fff2be511af165da199ac225deff3
 
 post_install() {
 	vlicense LICENSE

From 1936be3cffab5df0ebaa44256da24f907181de3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 14:52:25 +0100
Subject: [PATCH 710/752] qv4l2: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/qv4l2/patches/time64.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/qv4l2/patches/time64.patch

diff --git a/srcpkgs/qv4l2/patches/time64.patch b/srcpkgs/qv4l2/patches/time64.patch
new file mode 100644
index 00000000000..a4253cc7a57
--- /dev/null
+++ b/srcpkgs/qv4l2/patches/time64.patch
@@ -0,0 +1,11 @@
+--- utils/keytable/keytable.c	2019-09-22 11:22:54.000000000 +0200
++++ utils/keytable/keytable.c	2021-01-15 14:48:30.569549169 +0100
+@@ -1533,7 +1533,7 @@
+ 
+ 		for (i = 0; i < rd / sizeof(struct input_event); i++) {
+ 			printf(_("%ld.%06ld: event type %s(0x%02x)"),
+-				ev[i].time.tv_sec, ev[i].time.tv_usec,
++				ev[i].input_event_sec, ev[i].input_event_usec,
+ 				get_event_name(events_type, ev[i].type), ev[i].type);
+ 
+ 			switch (ev[i].type) {

From e494cb0220d3371544deb99c10dc2d27e604766a Mon Sep 17 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, 15 Jan 2021 22:23:14 +0700
Subject: [PATCH 711/752] io.elementary.photos: fix ftbfs

---
 .../patches/fix-meson.patch                   | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create 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
new file mode 100644
index 00000000000..779b4dcdbaf
--- /dev/null
+++ b/srcpkgs/io.elementary.photos/patches/fix-meson.patch
@@ -0,0 +1,95 @@
+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
+--- meson.build
++++ 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
+--- src/meson.build
++++ 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,

From 13c2f3709f824d749f4d8e6cefc00d491bd32ee7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 15 Jan 2021 17:33:33 +0100
Subject: [PATCH 712/752] libvirt: update to 7.0.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index b4978fae705..39b5b6b6102 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=6.10.0
-revision=3
+version=7.0.0
+revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
 hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=30cfc1365b7a62bf08c5254103087fac51c4210343aa958a7d38cedd280ed2aa
+checksum=ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 1bdac6b6b54bc183fd84384d17760c329069d1bd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 15 Jan 2021 17:36:13 +0100
Subject: [PATCH 713/752] libvirt-python3: update to 7.0.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 d115287bdea..e75afe427d7 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=6.10.0
+version=7.0.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=47a8e90d9f49bc0296d2817f6009e18dbb69844ce10b81c2a2672bccd6f49fd5
+checksum=7e1663da2587e87106fc226160b33ae2160989c32176ad17d876315d5c1c36b5

From d9e720e1b43a8ef2301d9512f42719116a0cd862 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 15 Jan 2021 10:39:48 -0600
Subject: [PATCH 714/752] yq-go: update to 4.4.0.

---
 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 7c70e6810ff..d0ce82119de 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,16 +1,16 @@
 # Template file for 'yq-go'
 pkgname=yq-go
-version=4.3.2
+version=4.4.0
 revision=1
 wrksrc="yq-${version}"
 build_style=go
-go_import_path=github.com/mikefarah/yq/v3
+go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=7e739f3d96dfb508bf52f33741135121363cf1bf21e3a890e5d8a937877881dc
+checksum=bd87dad46efbe333d0ed2da0b142e429833259d02d6310d97c95704ea0430a83
 
 do_check() {
 	go test -v

From 90b351ca8b5585a526b29c3c2f60f5e726e6cc5d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Jan 2021 12:03:52 +0200
Subject: [PATCH 715/752] font-awesome5: update to 5.15.2.

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

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index b7fedfdcc83..24af77fee56 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.1
+version=5.15.2
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=f229f46cd6cabb6380c7c503772cb42ed19497da26a002005509388c8930e7e1
+checksum=ce8d6225c59c2fedab03658144d896807e58d7d5082da7c9655301a44c5cb3d2
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 

From cbfe84dc2313c349b2411f025a5818e2f08bde5c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Jan 2021 12:00:08 +0200
Subject: [PATCH 716/752] FeatherPad: update to 0.17.2.

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

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 3ebfc5d376f..8558f283538 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.17.1
+version=0.17.2
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=021fd515979483df93d8652dabab6cdd4d383ee4bbbe8a091a597a8e497fe61f
+checksum=2e706beeec7d2664b888bc908febae1e4bfe014b3c1d22aece6088a8d023d45c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"

From b4c83a508ddc3cfe39a2b8229ce848a8dda1a10e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 14 Jan 2021 21:35:21 -0800
Subject: [PATCH 717/752] gammastep: update to 2.0.7

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

diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index bd889301ec6..b03e346a9b5 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,6 +1,6 @@
 # Template file for 'gammastep'
 pkgname=gammastep
-version=2.0.6
+version=2.0.7
 revision=1
 wrksrc="${pkgname}-v$version"
 build_style=gnu-configure
@@ -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=c5c2cc8d5a7c451c92a2d00415697eff45c792d438b0dd275dbab04f7b940160
+checksum=b3dc1d515088ef5578da009c4b70b22f9702397a6a21bbba79f1c01793a90e73
 build_options="geoclue2"
 build_options_default="geoclue2"
 

From 03941640f5231c74885fe94c4105eecc93591f42 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 14 Jan 2021 19:16:53 +0200
Subject: [PATCH 718/752] dhcpcd-qt: update to 0.7.8.

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

diff --git a/srcpkgs/dhcpcd-qt/template b/srcpkgs/dhcpcd-qt/template
index 9e8ed14d4bd..37a487bf5f3 100644
--- a/srcpkgs/dhcpcd-qt/template
+++ b/srcpkgs/dhcpcd-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'dhcpcd-qt'
 pkgname=dhcpcd-qt
-version=0.7.7
+version=0.7.8
 revision=1
 wrksrc="dhcpcd-ui-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://roy.marples.name/projects/dhcpcd-ui"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-${version}.tar.xz"
-checksum=81d448f82c9aa88ff85e4bc3cead5e4c7f3ea08e57c713dff9996fb5ba2c42b0
+checksum=4170a07b8bbba65b30f8da8a15a4d776cbf17d030b666516821d450f594a9d6c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"

From 1aa93a5618d9bebcecc7e4fee6ae7f8edca3e7b8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 14 Jan 2021 19:16:58 +0200
Subject: [PATCH 719/752] dhcpcd-gtk: update to 0.7.8.

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

diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 08cd8a90dbc..3ea822dc01f 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd-gtk'
 pkgname=dhcpcd-gtk
-version=0.7.7
-revision=2
+version=0.7.8
+revision=1
 wrksrc=dhcpcd-ui-${version}
 build_style=gnu-configure
 configure_args="--with-gtk --with-icons --with-notification"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://roy.marples.name/projects/dhcpcd-ui"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.xz"
-checksum=81d448f82c9aa88ff85e4bc3cead5e4c7f3ea08e57c713dff9996fb5ba2c42b0
+checksum=4170a07b8bbba65b30f8da8a15a4d776cbf17d030b666516821d450f594a9d6c
 
 if [ "${XBPS_TARGET_LIBC}" = musl ]; then
 	makedepends+=" musl-legacy-compat"

From 03a15055b721cceb1984f6a5d0c0f3bb4d15722b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 14 Jan 2021 18:59:19 +0200
Subject: [PATCH 720/752] gptfdisk: update to 1.0.6.

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

diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index ab9b41e8245..e3b76491194 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -1,6 +1,6 @@
 # Template file for 'gptfdisk'
 pkgname=gptfdisk
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-makefile
 makedepends="ncurses-devel popt-devel icu-devel libuuid-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.rodsbooks.com/gdisk/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f
+checksum=ddc551d643a53f0bd4440345d3ae32c49b04a797e9c01036ea460b6bb4168ca8
 
 pre_build() {
 	sed -i 's#<ncursesw/ncurses.h>#<ncurses.h>#' gptcurses.cc

From 442596ed62fba405fd8b50f37f0726a1f2acfee3 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 17:56:00 +0100
Subject: [PATCH 721/752] duplicity: update to 0.8.18

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

diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index ff421ea456f..fa066c26750 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,7 +1,7 @@
 # Template file for 'duplicity'
 pkgname=duplicity
-version=0.8.16
-revision=2
+version=0.8.18
+revision=1
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 makedepends="python3-devel librsync-devel"
@@ -10,13 +10,9 @@ short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://duplicity.nongnu.org/"
-changelog="http://duplicity.nongnu.org/vers8/CHANGELOG"
+changelog="http://duplicity.nongnu.org/vers8/CHANGELOG.md"
 distfiles="http://launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz"
-checksum=2cfcd212834979751310d9df1a954b949f86b084efd5ad1f97dd744780ef9d1b
-
-post_extract() {
-	chmod 0644 bin/*.1
-}
+checksum=2643fea0f52920a0fb114069c78389f9621f1c24db7f26bda77bbc239b01ae53
 
 do_check() {
 	# Disable as tests don't work

From d9317d06a3d60fd45e8470fc54277a3945bbcbf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 18:56:05 +0100
Subject: [PATCH 722/752] netperf: fix build w/ gcc10

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

diff --git a/srcpkgs/netperf/template b/srcpkgs/netperf/template
index fbcb0c9eb3a..cf2189d7727 100644
--- a/srcpkgs/netperf/template
+++ b/srcpkgs/netperf/template
@@ -12,6 +12,8 @@ distfiles="https://github.com/HewlettPackard/netperf/archive/netperf-${version}.
 checksum=4569bafa4cca3d548eb96a486755af40bd9ceb6ab7c6abd81cc6aa4875007c4e
 repository=nonfree
 
+CFLAGS="-fcommon"
+
 post_install() {
 	vlicense COPYING
 }

From cee8cf2ffd3e8fe94d776f73017a5841e6e97ab9 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 14 Jan 2021 13:07:52 +0100
Subject: [PATCH 723/752] synapse: update to 1.25.0.

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

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

From 2597b621bfe32deb1caa1dcca8bea91eb593babb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 18:58:47 +0100
Subject: [PATCH 724/752] libmp4v2: fix build w/ gcc10

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

diff --git a/srcpkgs/libmp4v2/template b/srcpkgs/libmp4v2/template
index 3b1c4398cac..674b6ee304a 100644
--- a/srcpkgs/libmp4v2/template
+++ b/srcpkgs/libmp4v2/template
@@ -12,6 +12,8 @@ license="MPL-1.1"
 distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${wrksrc}.tar.bz2"
 checksum=0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338
 
+CXXFLAGS="-Wno-narrowing"
+
 libmp4v2-devel_package() {
 	depends="libmp4v2>=${version}_${revision}"
 	short_desc+=" - development files"

From 1d3fae4c6b29f586635e676e305bfbaf1386ccae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 19:15:53 +0100
Subject: [PATCH 725/752] cpulimit: fix build w/ glibc-2.32

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

diff --git a/srcpkgs/cpulimit/template b/srcpkgs/cpulimit/template
index 7ac8cf968e9..4857387f4e8 100644
--- a/srcpkgs/cpulimit/template
+++ b/srcpkgs/cpulimit/template
@@ -12,6 +12,7 @@ checksum=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da
 
 pre_build() {
 	export CFLAGS="$CFLAGS $LDFLAGS"
+	vsed -i -e "s;<sys/sysctl.h>;<linux/sysctl.h>;" src/cpulimit.c
 }
 
 do_install() {

From b973cd37d83f84d879d7e0e6021b2a8d1f2a9933 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Jan 2021 13:10:09 +0200
Subject: [PATCH 726/752] nano: update to 5.5.

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

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index ddd121dbf8f..16bca4f6dbe 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=5.4
+version=5.5
 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=fe993408b22286355809ce48ebecc4444d19af8203ed4959d269969112ed86e9
+checksum=390b81bf9b41ff736db997aede4d1f60b4453fbd75a519a4ddb645f6fd687e4a
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From b28b6d773920134aaf397e17aa492919fadb7517 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 15 Jan 2021 13:23:29 +0200
Subject: [PATCH 727/752] font-vazir: update to 27.2.0.

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

diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
index 837e1c82aea..4bed98c410a 100644
--- a/srcpkgs/font-vazir/template
+++ b/srcpkgs/font-vazir/template
@@ -1,7 +1,7 @@
 # Template file for 'font-vazir'
 pkgname=font-vazir
-version=26.0.2
-revision=2
+version=27.2.0
+revision=1
 create_wrksrc=yes
 depends="font-util"
 short_desc="Persian (Farsi) Font - قلم (فونت) فارسی وزیر"
@@ -9,7 +9,7 @@ maintainer="linarcx <linarcx@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/rastikerdar/vazir-font"
 distfiles="https://github.com/rastikerdar/vazir-font/releases/download/v${version}/vazir-font-v${version}.zip"
-checksum=cb74f7db8257d783d6301c798ae2e10d25035aaf4d202fca17c2129578ab29c3
+checksum=29dd19de15983dd3b027f9760ef47c262e95d9e006326adc2c486245d9395a41
 
 font_dirs="/usr/share/fonts/TTF"
 

From 32f825cf32f519063f042fcc0b9e38b62f577c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 20:00:29 +0100
Subject: [PATCH 728/752] vsftpd: fix build

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

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 5a120c592c8..58c56630007 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -3,7 +3,7 @@ pkgname=vsftpd
 version=3.0.3
 revision=13
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 63488297995e7275a29164a8f6c45b0f33aa8b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 20:03:21 +0100
Subject: [PATCH 729/752] wvstreams: fix build w/ gcc10

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

diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index db8f89a2337..57426742a2d 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -12,9 +12,10 @@ makedepends="libressl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"
-
 replaces="uniconf>=0"
 
+CXXFLAGS="-Wno-narrowing"
+
 wvstreams-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"

From 72241fa09c62f9b4559d77a05fcfb297daca4cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 20:16:56 +0100
Subject: [PATCH 730/752] trn: fix build w/ gcc10

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

diff --git a/srcpkgs/trn/template b/srcpkgs/trn/template
index 73a546e46ae..749675e0486 100644
--- a/srcpkgs/trn/template
+++ b/srcpkgs/trn/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc=$pkgname-${version/test/-test}
 build_style=gnu-makefile
 hostmakedepends="groff bison"
-makedepends="ncurses-devel gettext-devel"
+makedepends="ncurses-devel gettext-devel libnsl-devel"
 depends="virtual?smtp-server"
 short_desc="Text-based threaded Usenet newsreader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -15,11 +15,12 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}4/${wrksrc}.tar.gz"
 checksum=9ab0430244903ad86ed74fcc2fdc39dc043d23968888e071313050a967b8a6ff
 nocross="sh: ./try: cannot execute binary file: Exec format error"
 
-CFLAGS="-fcommon"
+CFLAGS="-Wno-implicit-int -fcommon"
 
 post_extract() {
 	sed -i 's/pipe2/pipetwo/g' filter.c
 	sed -i '1i#include <time.h>' nntpclient.h
+	sed -i '/#include <stdio.h>/i #include <stdlib.h>' Configure
 }
 do_configure() {
 	cp ${FILESDIR}/Policy.sh .

From cd502de1ab7ca2834695b3a9095585afe6bc7f37 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 15 Jan 2021 22:49:46 +0100
Subject: [PATCH 731/752] binutils: force libiberty install

it is also not necessary to manually install the headers anymore
---
 srcpkgs/binutils/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index b87e20315fb..5b736c2e3a2 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.35.1
-revision=2
+revision=3
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -85,6 +85,7 @@ do_configure() {
 		--enable-deterministic-archives \
 		--enable-64-bit-bfd \
 		--enable-ld=default \
+		--enable-install-libiberty \
 		--with-system-zlib \
 		--with-mmap \
 		--with-pic \
@@ -115,10 +116,6 @@ do_install() {
 	rm -f ${DESTDIR}/usr/bin/ld
 	ln -sfr ${DESTDIR}/usr/bin/ld.bfd ${DESTDIR}/usr/bin/ld
 
-	# Add some useful headers
-	vinstall include/libiberty.h 644 usr/include
- 	vinstall include/demangle.h 644 usr/include
-
 	# Remove these symlinks, they are not ABI stable.
 	# Programs should compile static to the .a file.
 	rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so

From f84576c4c7ec766b200c8116f11a2e0cc8329204 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 15 Jan 2021 23:13:55 +0100
Subject: [PATCH 732/752] oprofile: enable on ppc*

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

diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index d4727ac5fd9..f14cdd3cdd2 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -17,5 +17,5 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=7ba06f99d7c188389d20d1d5e53ee690c7733f87aa9af62bd664fa0ca235a412
 
 case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="requires libpfm, which is not packaged";;
+	ppc*) makedepends+=" papi-devel";;
 esac

From fe2ae852fa189ef4be7097adb0de048db7950d4d Mon Sep 17 00:00:00 2001
From: D-Nice <d-nice2@protonmail.com>
Date: Tue, 12 Jan 2021 20:21:23 -0500
Subject: [PATCH 733/752] tomb: update to 2.9

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

diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 1173ce3df86..f85b1a32aea 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,7 +1,7 @@
 # Template file for 'tomb'
 pkgname=tomb
-version=2.8.1
-revision=2
+version=2.9
+revision=1
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,8 +10,9 @@ short_desc="Minimalistic commandline tool to manage encrypted volumes"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.dyne.org/software/tomb/"
+changelog="https://raw.githubusercontent.com/dyne/Tomb/master/ChangeLog.md"
 distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
-checksum=74865ea3364706323a3ebe12886d5816dd86c90a100bc3b49fae6e60cbb7be16
+checksum=b3a23c6680815f7557a3c4bd73d2b2dbde870a62357fcbf9b33089afae75d68c
 
 post_patch() {
 	vsed -i extras/gtk-tray/Makefile \

From 6601c5ff594864a0c18dc3b0803ca7dd0148df2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 15 Jan 2021 23:32:46 +0100
Subject: [PATCH 734/752] p7zip: fix build w/ gcc10

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

diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template
index 54e901f5102..642e24adaf5 100644
--- a/srcpkgs/p7zip/template
+++ b/srcpkgs/p7zip/template
@@ -11,6 +11,8 @@ homepage="http://p7zip.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 checksum=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
 
+CXXFLAGS="-Wno-narrowing"
+
 do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*) cp makefile.linux_x86_asm_gcc_4.X makefile.machine;;

From 7a8633c6aac7fc3cd0c89a5e629c8a2cdf4a1b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 00:25:21 +0100
Subject: [PATCH 735/752] libixion: fix build

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

diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index bf76740007b..63604118bbf 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -4,7 +4,7 @@ version=0.15.0
 revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
-makedepends="boost-devel mdds python3-devel spdlog"
+makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
 short_desc="General purpose formula parser and interpreter"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0"

From fad5d9c4b8d6dd0a55d50b3dc784e0098cc40745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 00:30:54 +0100
Subject: [PATCH 736/752] irrlicht: fix build w/ glibc-2.32

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

diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template
index 39cca62f753..b8e852b7be5 100644
--- a/srcpkgs/irrlicht/template
+++ b/srcpkgs/irrlicht/template
@@ -14,6 +14,7 @@ CPPFLAGS="-DPNG_ARM_NEON_OPT=0"
 
 pre_build() {
 	cd source/Irrlicht
+	vsed -i 's;<sys/sysctl.h>;<linux/sysctl.h>;' COSOperator.cpp
 	for file in COpenGLExtensionHandler.h glext.h glxext.h wglext.h; do
 		$XBPS_FETCH_CMD "http://sourceforge.net/p/irrlicht/code/4600/tree/trunk/source/Irrlicht/${file}?format=raw>${file}"
 	done

From d00d018ac1ccd5ec46c857818dbe7c1e4ec3a1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 00:36:54 +0100
Subject: [PATCH 737/752] pekwm: fix build w/ gcc10

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

diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template
index 13859b65f0a..19fdb952d03 100644
--- a/srcpkgs/pekwm/template
+++ b/srcpkgs/pekwm/template
@@ -8,16 +8,16 @@ configure_args="--with-pkg-exec-prefix=/usr
  ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
  ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
  ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel libXinerama-devel
+ libSM-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
 short_desc="Window manager based on aewm++"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.pekwm.org/projects/pekwm"
 distfiles="${DEBIAN_SITE}/main/p/pekwm/pekwm_${version}.orig.tar.bz2"
 checksum=8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
 
-hostmakedepends="pkg-config"
-makedepends="libjpeg-turbo-devel libpng-devel libXinerama-devel
- libSM-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
 conf_files="
 	/etc/pekwm/vars
 	/etc/pekwm/mouse
@@ -31,3 +31,5 @@ conf_files="
 	/etc/pekwm/mouse_sloppy
 	/etc/pekwm/mouse_click
 	/etc/pekwm/config_system"
+
+CXXFLAGS="-Wno-narrowing"

From 18eb883768e7c48338359fc6e7c03b7682261441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 09:57:06 +0100
Subject: [PATCH 738/752] openjdk7-bootstrap: fix build w/ glibc-2.32

---
 .../files/dist_patches_glibc.txt              |  1 +
 .../files/icedtea-jdk-sysctl_h.patch          | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch

diff --git a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
index a9cf2cbeab5..c76c5685544 100644
--- a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
+++ b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
@@ -4,4 +4,5 @@ icedtea-jdk-execinfo.patch
 icedtea-jdk-fix-ipv6-init.patch
 icedtea-jdk-no-soname.patch
 icedtea-jdk-xattr.patch
+icedtea-jdk-sysctl_h.patch
 icedtea-cpio.patch
diff --git a/srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch b/srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch
new file mode 100644
index 00000000000..7cfaecdb185
--- /dev/null
+++ b/srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch
@@ -0,0 +1,55 @@
+--- openjdk.orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	2019-04-16 05:24:16.000000000 +0200
++++ openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	2021-01-16 09:43:09.253748103 +0100
+@@ -33,7 +33,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #if defined(_ALLBSD_SOURCE)
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #ifdef __APPLE__
+ #include <sys/param.h>
+ #include <sys/mount.h>
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2019-04-16 05:24:16.000000000 +0200
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2021-01-16 09:43:09.253748103 +0100
+@@ -41,7 +41,7 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2019-04-16 05:24:16.000000000 +0200
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2021-01-16 09:43:09.252748056 +0100
+@@ -43,7 +43,7 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
+--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c	2019-04-16 05:24:16.000000000 +0200
++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c	2021-01-16 09:43:09.252748056 +0100
+@@ -40,7 +40,7 @@
+ #else
+ #include <limits.h>
+ #include <sys/param.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #ifndef MAXINT
+ #define MAXINT INT_MAX
+ #endif
+--- openjdk.orig/jdk/src/solaris/native/sun/net/portconfig.c	2019-04-16 05:24:16.000000000 +0200
++++ openjdk/jdk/src/solaris/native/sun/net/portconfig.c	2021-01-16 09:43:09.252748056 +0100
+@@ -29,7 +29,7 @@
+ #include <errno.h>
+ 
+ #if defined(_ALLBSD_SOURCE)
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #endif
+ 
+ #include "jni.h"

From 7f5e164afe6dc2ac863db949a1fd08531a04fe48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 10:28:52 +0100
Subject: [PATCH 739/752] fs-utils: fix build w/ glibc-2.32

---
 srcpkgs/fs-utils/patches/fix-sysctl_h.patch | 66 +++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 srcpkgs/fs-utils/patches/fix-sysctl_h.patch

diff --git a/srcpkgs/fs-utils/patches/fix-sysctl_h.patch b/srcpkgs/fs-utils/patches/fix-sysctl_h.patch
new file mode 100644
index 00000000000..32c4dc88fe4
--- /dev/null
+++ b/srcpkgs/fs-utils/patches/fix-sysctl_h.patch
@@ -0,0 +1,66 @@
+--- lib/smb/ctx.c	2013-12-13 21:29:42.000000000 +0100
++++ lib/smb/ctx.c	2021-01-16 10:26:44.803835850 +0100
+@@ -34,7 +34,7 @@
+ 
+ 
+ #include <sys/param.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/time.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+--- lib/smb/file.c	2013-12-13 21:29:42.000000000 +0100
++++ lib/smb/file.c	2021-01-16 10:26:41.672690378 +0100
+@@ -33,7 +33,7 @@
+  */
+ 
+ #include <sys/param.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/time.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+--- lib/smb/kiconv.c	2013-12-13 21:29:42.000000000 +0100
++++ lib/smb/kiconv.c	2021-01-16 10:26:38.368536869 +0100
+@@ -34,7 +34,7 @@
+ 
+ #include <sys/param.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <netsmb/iconv.h>
+--- lib/smb/nls.c	2013-12-13 21:29:42.000000000 +0100
++++ lib/smb/nls.c	2021-01-16 10:26:35.772416254 +0100
+@@ -34,7 +34,7 @@
+ 
+ #include <sys/param.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <ctype.h>
+ #ifndef APPLE
+ #include <dlfcn.h>
+--- lib/smb/print.c	2013-12-13 21:29:42.000000000 +0100
++++ lib/smb/print.c	2021-01-16 10:26:32.593268552 +0100
+@@ -33,7 +33,7 @@
+  */
+ 
+ #include <sys/param.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/time.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+--- lib/smb/subr.c	2013-12-13 21:29:42.000000000 +0100
++++ lib/smb/subr.c	2021-01-16 10:26:30.153155186 +0100
+@@ -35,7 +35,7 @@
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/errno.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ #include <ctype.h>

From e15443ffc8ac642f0a74291a8e34d758206006ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 10:54:00 +0100
Subject: [PATCH 740/752] bomi: fix build w/ glibc-2.32

---
 srcpkgs/bomi/patches/fix-sysctl_h.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch

diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 00000000000..48bb772114b
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>

From 06f285b8cf86f151c76702f3624344e53cc1fc6d Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sat, 16 Jan 2021 11:01:23 +0100
Subject: [PATCH 741/752] OpenCoarrays: Removed empty line to pass LINT test

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
index 1dd0b170662..97a6f625b69 100644
--- a/srcpkgs/OpenCoarrays/template
+++ b/srcpkgs/OpenCoarrays/template
@@ -12,4 +12,3 @@ license="GPL-3.0-or-later"
 homepage="http://www.opencoarrays.org/"
 distfiles="https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.9.2/OpenCoarrays-${version}.tar.gz"
 checksum=6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7
-

From 54a52befadcbac467ee2903141f5c2e21e788028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 12:21:41 +0100
Subject: [PATCH 742/752] mp3val: fix build

open(2) with O_CREAT requires mode parametet.
---
 srcpkgs/mp3val/patches/fix-open-mode.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/mp3val/patches/fix-open-mode.patch

diff --git a/srcpkgs/mp3val/patches/fix-open-mode.patch b/srcpkgs/mp3val/patches/fix-open-mode.patch
new file mode 100644
index 00000000000..8944d1ad459
--- /dev/null
+++ b/srcpkgs/mp3val/patches/fix-open-mode.patch
@@ -0,0 +1,11 @@
+--- crossapi.cpp	2009-06-25 22:14:03.000000000 +0200
++++ crossapi.cpp	2021-01-16 12:20:29.220265744 +0100
+@@ -241,7 +241,7 @@
+ //Moving failed due to different logical drives of source and destination. Let's copy:
+ 	id=open(szOldName,O_RDONLY);
+ 	if(id==-1) return 0;
+-	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);
++	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC,0666);
+ 	if(od==-1) {
+ 		close(id);
+ 		return 0;

From 8415ff1ab773968b212f37c39170e808e1638887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 12:42:46 +0100
Subject: [PATCH 743/752] avidemux: fix install

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

diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 7c7dea5b184..25747b767a8 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -30,6 +30,7 @@ do_configure() {
 		${cross_compile}
 }
 do_install() {
+	mv install/usr/lib{${XBPS_TARGET_WORDSIZE},}
 	cp -aR install/usr ${DESTDIR}
 	ln -s avidemux3_qt5 ${DESTDIR}/usr/bin/avidemux
 	vman man/avidemux.1

From 6ce78e858d21bea8c64d322da7c34056ef9c2803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 13:04:29 +0100
Subject: [PATCH 744/752] libknet1: fix build w/ gcc10

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

diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 05d916654a9..4e073b09bdd 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -19,6 +19,8 @@ checksum=c2ee20a9b5b0791ed5379b38b0b51d549603933925a839f045455553f03e6114
 
 patch_args='-Np1'
 
+CFLAGS="-Wno-format-truncation"
+
 pre_configure() {
 	autoreconf -fi
 }

From 40dc24c66cc4b88f09e15bfd57c4f1d4de76abee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 13:07:34 +0100
Subject: [PATCH 745/752] nheko: fix build

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

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 1340e2b1b79..198407862a4 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -4,7 +4,7 @@ version=0.7.2
 revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
-makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
+makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
  tweeny spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++
  libsodium-devel lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel"
 depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects

From b2ffcdcdfd54d145087e4766981a2693c7976ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 13:31:54 +0100
Subject: [PATCH 746/752] openimageio: fix build w/ tiff-4.2.0

The newer tiff.h already defines the GPSTAG_... macros.
---
 .../openimageio/patches/fix-tiff-4.2.0.patch  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch

diff --git a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
new file mode 100644
index 00000000000..20ba5792f7d
--- /dev/null
+++ b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
@@ -0,0 +1,23 @@
+--- src/libOpenImageIO/exif.cpp	2018-12-01 17:42:08.000000000 +0100
++++ src/libOpenImageIO/exif.cpp	2021-01-16 13:30:01.747255896 +0100
+@@ -212,7 +212,7 @@
+ };
+ 
+ 
+-
++#if !defined(GPSTAG_VERSIONID)
+ enum GPSTag {
+     GPSTAG_VERSIONID = 0, 
+     GPSTAG_LATITUDEREF = 1,  GPSTAG_LATITUDE = 2,
+@@ -237,6 +237,11 @@
+     GPSTAG_DIFFERENTIAL = 30,
+     GPSTAG_HPOSITIONINGERROR = 31
+ };
++#endif
++#if !defined(GPSTAG_HPOSITIONINGERROR)
++/* The tiff.h tag name differs from the one used here */
++#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
++#endif
+ 
+ static const EXIF_tag_info gps_tag_table[] = {
+     { GPSTAG_VERSIONID,		"GPS:VersionID",	TIFF_BYTE, 4 }, 

From b83202e18e8f2912e12d972aa42cc04b9c49f0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 13:53:53 +0100
Subject: [PATCH 747/752] dbeaver: update to 7.3.2

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index ae7f229fd6d..e09a1fdf757 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.3.1
+version=7.3.2
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -10,7 +10,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=a597d7d73c203fa0aee849496ed021fb566a2c43b78d19395a5049200dbc7f30
+checksum=9b37ef875771cfb34507d5423965ce1e79d263a31c245c46a89b44f01c4d9c85
 nopie=true
 
 do_build() {

From 22ccdcde38224ab06c1dfb33e10284219db713fd Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 14 Jan 2021 18:46:35 +1100
Subject: [PATCH 748/752] snapcast: update to 0.23.0

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

diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template
index 8a1381d4b87..d169582b17f 100644
--- a/srcpkgs/snapcast/template
+++ b/srcpkgs/snapcast/template
@@ -1,21 +1,24 @@
 # Template file for 'snapcast'
 pkgname=snapcast
-version=0.22.0
+version=0.23.0
 revision=1
 build_style=cmake
-configure_args="-DBUILD_WITH_TREMOR=OFF -DBUILD_WITH_AVAHI=$(vopt_if avahi ON OFF)
- -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DBUILD_WITH_TREMOR=OFF
+ -DBUILD_WITH_AVAHI=$(vopt_if avahi ON OFF)
+ -DBUILD_WITH_PULSE=$(vopt_if pulseaudio ON OFF)"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel boost-devel expat-devel libflac-devel libsoxr-devel
- libvorbis-devel opus-devel $(vopt_if avahi avahi-libs-devel)"
+ libvorbis-devel opus-devel $(vopt_if avahi avahi-libs-devel)
+ $(vopt_if pulseaudio pulseaudio-devel)"
 short_desc="Synchronous multi-room audio player"
 maintainer="amak <amak.git@outlook.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/badaix/snapcast"
 distfiles="https://github.com/badaix/snapcast/archive/v${version}.tar.gz"
-checksum=b5156f346c32557bc1347c81fd5071fd4a32be61adc582e63323c11b105c9ff6
+checksum=70efdeea60021f493f77ba1f3d00784911463cad11c6df214ecb19d74899b611
 
-build_options="avahi"
+build_options="avahi pulseaudio"
+build_options_default="avahi pulseaudio"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 49206141bc6b78498f7afb424cf8ed256aa98d2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Jan 2021 17:55:12 +0100
Subject: [PATCH 749/752] libnftnl: update to 1.1.9.

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

diff --git a/srcpkgs/libnftnl/template b/srcpkgs/libnftnl/template
index 15dbcb610d4..9f40c75e668 100644
--- a/srcpkgs/libnftnl/template
+++ b/srcpkgs/libnftnl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnftnl'
 pkgname=libnftnl
-version=1.1.8
+version=1.1.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.netfilter.org/projects/libnftnl/"
 distfiles="https://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=04a3fa5b08b736268f7e65836b9f05d9d5f438181467bee3c76c3c4a4f3ab711
+checksum=e9b21a6f9a41f9e72aff696cc842e4a9a78ec8d281aec188f3e2b7a21db94b9a
 
 libnftnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e997bfea85968893443ea2208a5ead6d38c26032 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Jan 2021 17:55:16 +0100
Subject: [PATCH 750/752] nftables: update to 0.9.8.

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

diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index 1ebe06788c0..58ddf92b94e 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,6 +1,6 @@
 # Template file for 'nftables'
 pkgname=nftables
-version=0.9.7
+version=0.9.8
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://netfilter.org/projects/nftables/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=fe6b8a8c326a2c09c02ca162b840d7d4aadb043ce7a367c166d6455b0e112cb0
+checksum=60fc004656dae4fefc4901c939c9d64120b4dedb49738e420a9a34989f108fe4
 
 post_install() {
 	vsv nftables

From f188cbde2348f3bb504224188628d9dd3de94ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 16 Jan 2021 18:15:29 +0100
Subject: [PATCH 751/752] espeak-ng: fix build w/ gcc10

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

diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
index 800da8e01d5..f6c13921fee 100644
--- a/srcpkgs/espeak-ng/template
+++ b/srcpkgs/espeak-ng/template
@@ -17,6 +17,8 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" espeak-ng"
 fi
 
+CFLAGS="-fcommon"
+
 pre_configure() {
 	./autogen.sh
 }

From 87c702065d1155400df1484b67e196a50022934f Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sun, 17 Jan 2021 10:19:56 +0100
Subject: [PATCH 752/752] New package: OpenCoarrays-2.9.2

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
index 97a6f625b69..2311a4b3878 100644
--- a/srcpkgs/OpenCoarrays/template
+++ b/srcpkgs/OpenCoarrays/template
@@ -3,12 +3,16 @@ pkgname=OpenCoarrays
 version=2.9.2
 revision=1
 build_style=cmake
-short_desc="OpenCoarray fortran PAGS paralellization library"
+hostmakedepends="gcc-fortran openmpi"
+makedepends="libgfortran-devel openmpi-devel"
+short_desc="Parallel application binary interface for Fortran 2018 compilers"
 maintainer="Alberto Ramos <alberto.ramos@ific.uv.es>"
-hostdepends="gcc gcc-fortran openmpi openmpi-devel cmake"
-makedepends="gcc gcc-fortran openmpi openmpi-devel cmake"
-depends="gcc gcc-fortran openmpi openmpi-devel cmake"
-license="GPL-3.0-or-later"
-homepage="http://www.opencoarrays.org/"
-distfiles="https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.9.2/OpenCoarrays-${version}.tar.gz"
-checksum=6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7
+license="BSD-3-Clause"
+homepage="https://opencoarrays.org"
+distfiles="https://github.com/sourceryinstitute/OpenCoarrays/archive/${version}.tar.gz"
+checksum=a11639034ecc2445b6e5efa187ab4fac2b0b384ddae5872d62f717b40922d259
+nocross="openmpi not available on cross build"
+  
+post_install() {
+	vlicense LICENSE
+}

Re: New package: Opencoarrays-2.9.2

[ramos]

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

New comment by ramos on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761767785

Comment:
Ok, Many thank

Not sure about the conflicts. I have checked that this builds ok in my system with your new template.

Many thanks!

Re: New package: Opencoarrays-2.9.2

[kawaiiamber]

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

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-761768503

Comment:
It looks like you pulled all changes from latest upstream master branch - over 700 commits! You might want to do a couple of things:
1. Add an upstream remote: `git remote add upstream https://github.com/void-linux/void-packages.git`
2. Rebase your branch against upstream master: `git pull --rebase upstream master`
3. Add a branch specifically for your template: `git checkout -b opencoarrays`, then add your template and push there: `git push origin opencoarrays`, switch this PR to merge from that branch rather than your forked master branch.

Re: New package: Opencoarrays-2.9.2

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/27618#issuecomment-1114433107

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: New package: Opencoarrays-2.9.2

[github-actions]

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

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

New package: Opencoarrays-2.9.2
https://github.com/void-linux/void-packages/pull/27618

Description:
None

[PR PATCH] New Package: OpenCoarrays-2.9.2

[ramos]

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

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

https://github.com/ramos/void-packages opencoarrays
https://github.com/void-linux/void-packages/pull/27993

New Package: OpenCoarrays-2.9.2
Hopefully final attempt.

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

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

From 00b76ece4aaf545443f14e318ec00f5bbc087b41 Mon Sep 17 00:00:00 2001
From: Alberto Ramos <alberto.ramos@ific.uv.es>
Date: Sun, 17 Jan 2021 22:08:07 +0100
Subject: [PATCH] New Package: OpenCoarrays-2.9.2

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

diff --git a/srcpkgs/OpenCoarrays/template b/srcpkgs/OpenCoarrays/template
new file mode 100644
index 00000000000..2311a4b3878
--- /dev/null
+++ b/srcpkgs/OpenCoarrays/template
@@ -0,0 +1,18 @@
+# Template file for 'OpenCoarrays'
+pkgname=OpenCoarrays
+version=2.9.2
+revision=1
+build_style=cmake
+hostmakedepends="gcc-fortran openmpi"
+makedepends="libgfortran-devel openmpi-devel"
+short_desc="Parallel application binary interface for Fortran 2018 compilers"
+maintainer="Alberto Ramos <alberto.ramos@ific.uv.es>"
+license="BSD-3-Clause"
+homepage="https://opencoarrays.org"
+distfiles="https://github.com/sourceryinstitute/OpenCoarrays/archive/${version}.tar.gz"
+checksum=a11639034ecc2445b6e5efa187ab4fac2b0b384ddae5872d62f717b40922d259
+nocross="openmpi not available on cross build"
+  
+post_install() {
+	vlicense LICENSE
+}