Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: tree-sitter 0.17.3
@ 2020-11-18 16:27 harrisonthorne
  2020-11-18 16:40 ` [PR PATCH] [Updated] " harrisonthorne
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: harrisonthorne @ 2020-11-18 16:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/harrisonthorne/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/26484

New package: tree-sitter 0.17.3
Neovim's upcoming 0.5 seems to have `tree-sitter` as a dependency. This pull request adds both `tree-sitter` and `tree-sitter-devel` packages.

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

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

From 4e2d655a0da3e4e93453b938cbb0751b9d721dc6 Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrison.thorne@gmail.com>
Date: Tue, 4 Aug 2020 21:37:12 -0600
Subject: [PATCH 1/4] added awesome-git, picom-tryone-git

---
 srcpkgs/awesome-git/template      | 31 +++++++++++++++++++++++++++++++
 srcpkgs/picom-tryone-git/template | 29 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 srcpkgs/awesome-git/template
 create mode 100644 srcpkgs/picom-tryone-git/template

diff --git a/srcpkgs/awesome-git/template b/srcpkgs/awesome-git/template
new file mode 100644
index 00000000000..292b37d72ef
--- /dev/null
+++ b/srcpkgs/awesome-git/template
@@ -0,0 +1,31 @@
+# Template file for 'awesome-git'
+pkgname=awesome-git
+version=4.3.862.g7a759432
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DSYSCONFDIR=/etc"
+conf_files="/etc/xdg/awesome/rc.lua"
+hostmakedepends="ruby-asciidoctor ImageMagick lua53-lgi lua53 pkg-config xmlto"
+makedepends="libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel
+ xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel imlib2-devel lua53-lgi libxdg-basedir-devel
+ gdk-pixbuf-devel lua53-devel dbus-devel libxkbcommon-devel xcb-util-xrm-devel"
+depends="dbus-x11 lua53-lgi>=0.7.2 pango"
+short_desc="Highly configurable, next gen framework window manager for X (master branch)"
+maintainer="Harrison Thorne <harrisonthorne@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://awesomewm.org"
+distfiles="https://github.com/awesomeWM/awesome/archive/master.zip>${pkgname}-${version}.zip"
+conflicts="awesome"
+checksum="125955ec07c9161bde5774fe0bb4008da9de1011fca083359370be98526a39ff"
+wrksrc="awesome-master"
+
+pre_configure() {
+	# Russian manpages fail to build.
+	vsed -i -e "s/es fr de ru/es fr de/g" CMakeLists.txt
+}
+
+post_install() {
+	vinstall awesome.desktop 644 usr/share/xsessions
+}
diff --git a/srcpkgs/picom-tryone-git/template b/srcpkgs/picom-tryone-git/template
new file mode 100644
index 00000000000..6f895769aa6
--- /dev/null
+++ b/srcpkgs/picom-tryone-git/template
@@ -0,0 +1,29 @@
+# Template file for 'picom-tryone-git'
+pkgname=picom-tryone-git
+_commit="9b4a6f062758f1f9a66d4e77d16c86c9aa259b42"
+version=6.rc1.501.g9b4a6f0
+revision=1
+build_style=meson
+configure_args="-Dwith_docs=true"
+hostmakedepends="pkg-config asciidoc tree"
+makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel
+ pcre-devel pixman-devel xcb-util-image-devel xcb-util-renderutil-devel
+ libxdg-basedir-devel uthash"
+depends="desktop-file-utils"
+short_desc="Lightweight compositor for X11 (previously a compton fork)"
+maintainer="Harrison Thorne <harrisonthorne@protonmail.com>"
+license="MIT, MPL-2.0"
+homepage="https://github.com/tryone144/picom"
+distfiles="https://github.com/tryone144/picom/archive/${_commit}.zip"
+conflicts="picom compton"
+wrksrc="picom-${_commit}"
+checksum=b844e774c22d829663f82c2ffcf960151d309c60cfdaa6a72fb1e2d922af3f1d
+
+post_fetch() {
+    build_wrksrc="${wrksrc}"
+}
+
+post_install() {
+	vlicense LICENSES/MIT
+	vsconf picom.sample.conf
+}

From 8bfe1adedfccbcd5ccc3469f38d726282cae6936 Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrison.thorne@gmail.com>
Date: Fri, 7 Aug 2020 13:23:35 -0600
Subject: [PATCH 2/4] font-mdi-ttf: add community Material Design Icons font

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

diff --git a/srcpkgs/font-mdi-ttf/template b/srcpkgs/font-mdi-ttf/template
new file mode 100644
index 00000000000..9c10f6183e2
--- /dev/null
+++ b/srcpkgs/font-mdi-ttf/template
@@ -0,0 +1,19 @@
+# Template file for 'font-mdi-ttf'
+pkgname=font-mdi-ttf
+version=5.4.55
+revision=1
+archs=noarch
+depends="font-util"
+wrksrc="MaterialDesign-Webfont-${version}"
+short_desc="Community-made Material Design icons"
+maintainer="Harrison Thorne <harrisonthorne@protonmail.com>"
+license="OFL-1.0-RFN"
+homepage="https://materialdesignicons.com"
+distfiles="https://github.com/Templarian/MaterialDesign-Webfont/archive/v5.4.55.tar.gz"
+checksum=5093a6728038d9f0dd77411ca6c8ab88edf5fda04527f4f6ab843e931b380b09
+
+font_dirs="/usr/share/fonts/TTF"
+
+do_install() {
+    vinstall fonts/materialdesignicons-webfont.ttf 644 usr/share/fonts/TTF MaterialDesignIcons.ttf
+}

From 29f9bb1d4141ca92a219b5b7dc3712826b5dfa65 Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrisonthorne@protonmail.com>
Date: Tue, 22 Sep 2020 17:37:24 -0600
Subject: [PATCH 3/4] awesome-git: Update to version 4.3.881.gca29aa19

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

diff --git a/srcpkgs/awesome-git/template b/srcpkgs/awesome-git/template
index 292b37d72ef..422928cb74e 100644
--- a/srcpkgs/awesome-git/template
+++ b/srcpkgs/awesome-git/template
@@ -1,6 +1,6 @@
 # Template file for 'awesome-git'
 pkgname=awesome-git
-version=4.3.862.g7a759432
+version=4.3.881.gca29aa19
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://awesomewm.org"
 distfiles="https://github.com/awesomeWM/awesome/archive/master.zip>${pkgname}-${version}.zip"
 conflicts="awesome"
-checksum="125955ec07c9161bde5774fe0bb4008da9de1011fca083359370be98526a39ff"
+checksum=c14763562ba8637839d74395030dc594ddf6c2e9bac98873a8dbfda59a86462a
 wrksrc="awesome-master"
 
 pre_configure() {

From c885d7dcb8900588a9b2bfa013eb0ebfc4ef33f0 Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrisonthorne@protonmail.com>
Date: Wed, 18 Nov 2020 08:25:32 -0700
Subject: [PATCH 4/4] New package: tree-sitter-0.17.3

---
 common/shlibs                |  1 +
 srcpkgs/tree-sitter-devel    |  1 +
 srcpkgs/tree-sitter/template | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 120000 srcpkgs/tree-sitter-devel
 create mode 100644 srcpkgs/tree-sitter/template

diff --git a/common/shlibs b/common/shlibs
index 5e274cc8d8d..de9da1c194a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ liburing.so.1 liburing-0.7_1
 libbson-1.0.so.0 libbson-1.17.0_1
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
+libtree-sitter.so.0 tree-sitter-0.17.3_1
diff --git a/srcpkgs/tree-sitter-devel b/srcpkgs/tree-sitter-devel
new file mode 120000
index 00000000000..25ba75a1097
--- /dev/null
+++ b/srcpkgs/tree-sitter-devel
@@ -0,0 +1 @@
+tree-sitter/
\ No newline at end of file
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
new file mode 100644
index 00000000000..99fd184ef78
--- /dev/null
+++ b/srcpkgs/tree-sitter/template
@@ -0,0 +1,22 @@
+# Template file for 'tree-sitter'
+pkgname=tree-sitter
+version=0.17.3
+revision=1
+build_style=gnu-makefile
+short_desc="Parser generator tool and incremental parsing library"
+maintainer="Harrison Thorne <harrisonthorne@protonmail.com>"
+license="MIT"
+homepage="https://tree-sitter.github.io"
+distfiles="https://github.com/tree-sitter/${pkgname}/archive/${version}.tar.gz"
+checksum=a897e5c9a7ccb74271d9b20d59121d2d2e9de8b896c4d1cfaac0f8104c1ef9f8
+
+tree-sitter-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

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

* Re: [PR PATCH] [Updated] New package: tree-sitter 0.17.3
  2020-11-18 16:27 [PR PATCH] New package: tree-sitter 0.17.3 harrisonthorne
@ 2020-11-18 16:40 ` harrisonthorne
  2020-11-18 16:54 ` ericonr
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: harrisonthorne @ 2020-11-18 16:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/harrisonthorne/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/26484

New package: tree-sitter 0.17.3
Neovim's upcoming 0.5 seems to have `tree-sitter` as a dependency. This pull request adds both `tree-sitter` and `tree-sitter-devel` packages.

Edit: oops, I'll need to get rid of those other pesky commits

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

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

From 276a417b695d3b558187e7a4160e59debb15190a Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrisonthorne@protonmail.com>
Date: Wed, 18 Nov 2020 08:25:32 -0700
Subject: [PATCH] New package: tree-sitter-0.17.3

---
 common/shlibs                |  1 +
 srcpkgs/tree-sitter-devel    |  1 +
 srcpkgs/tree-sitter/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/tree-sitter-devel
 create mode 100644 srcpkgs/tree-sitter/template

diff --git a/common/shlibs b/common/shlibs
index 5e274cc8d8d..de9da1c194a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ liburing.so.1 liburing-0.7_1
 libbson-1.0.so.0 libbson-1.17.0_1
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
+libtree-sitter.so.0 tree-sitter-0.17.3_1
diff --git a/srcpkgs/tree-sitter-devel b/srcpkgs/tree-sitter-devel
new file mode 120000
index 00000000000..25ba75a1097
--- /dev/null
+++ b/srcpkgs/tree-sitter-devel
@@ -0,0 +1 @@
+tree-sitter/
\ No newline at end of file
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
new file mode 100644
index 00000000000..3130ba7eaf6
--- /dev/null
+++ b/srcpkgs/tree-sitter/template
@@ -0,0 +1,26 @@
+# Template file for 'tree-sitter'
+pkgname=tree-sitter
+version=0.17.3
+revision=1
+build_style=gnu-makefile
+short_desc="Parser generator tool and incremental parsing library"
+maintainer="Harrison Thorne <harrisonthorne@protonmail.com>"
+license="MIT"
+homepage="https://tree-sitter.github.io"
+distfiles="https://github.com/tree-sitter/${pkgname}/archive/${version}.tar.gz"
+checksum=a897e5c9a7ccb74271d9b20d59121d2d2e9de8b896c4d1cfaac0f8104c1ef9f8
+
+post_install() {
+	vlicense LICENSE
+}
+
+tree-sitter-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

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

* Re: New package: tree-sitter 0.17.3
  2020-11-18 16:27 [PR PATCH] New package: tree-sitter 0.17.3 harrisonthorne
  2020-11-18 16:40 ` [PR PATCH] [Updated] " harrisonthorne
@ 2020-11-18 16:54 ` ericonr
  2020-11-18 17:16 ` ericonr
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-11-18 16:54 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26484#issuecomment-729810445

Comment:
Can you try force pushing again? If the PR was originally a draft, it won't run CI without that.

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

* Re: New package: tree-sitter 0.17.3
  2020-11-18 16:27 [PR PATCH] New package: tree-sitter 0.17.3 harrisonthorne
  2020-11-18 16:40 ` [PR PATCH] [Updated] " harrisonthorne
  2020-11-18 16:54 ` ericonr
@ 2020-11-18 17:16 ` ericonr
  2020-11-22 21:30 ` ericonr
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-11-18 17:16 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26484#issuecomment-729824423

Comment:
From freevan on IRC: this needs emscripten to be able to compile the wasm library (for javascript parsing): https://github.com/archlinux/svntogit-community/blob/f4c6fab2b3943f83b30a3832aa9e53a40518fcb8/trunk/PKGBUILD#L20

I believe there is a template for emscripten already, so I might be able to send it your way

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

* Re: New package: tree-sitter 0.17.3
  2020-11-18 16:27 [PR PATCH] New package: tree-sitter 0.17.3 harrisonthorne
                   ` (2 preceding siblings ...)
  2020-11-18 17:16 ` ericonr
@ 2020-11-22 21:30 ` ericonr
  2021-01-21 16:49 ` [PR PATCH] [Updated] " harrisonthorne
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-11-22 21:30 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26484#issuecomment-729824423

Comment:
From freevan on IRC: this needs emscripten to be able to compile the wasm library (for javascript parsing): https://github.com/archlinux/svntogit-community/blob/f4c6fab2b3943f83b30a3832aa9e53a40518fcb8/trunk/PKGBUILD#L20

I believe there is a template for emscripten already, so I might be able to send it your way

---

The above was wrong! This needs emscripten only to generate the WASM bindings; as is, it is still fully functional.

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

* Re: [PR PATCH] [Updated] New package: tree-sitter 0.17.3
  2020-11-18 16:27 [PR PATCH] New package: tree-sitter 0.17.3 harrisonthorne
                   ` (3 preceding siblings ...)
  2020-11-22 21:30 ` ericonr
@ 2021-01-21 16:49 ` harrisonthorne
  2021-01-21 16:57 ` harrisonthorne
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: harrisonthorne @ 2021-01-21 16:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/harrisonthorne/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/26484

New package: tree-sitter 0.17.3
Neovim's upcoming 0.5 seems to have `tree-sitter` as a dependency. This pull request adds both `tree-sitter` and `tree-sitter-devel` packages.

Edit: ~~oops, I'll need to get rid of those other pesky commits~~ Done

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

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

From 276a417b695d3b558187e7a4160e59debb15190a Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrisonthorne@protonmail.com>
Date: Wed, 18 Nov 2020 08:25:32 -0700
Subject: [PATCH 0001/3595] New package: tree-sitter-0.17.3

---
 common/shlibs                |  1 +
 srcpkgs/tree-sitter-devel    |  1 +
 srcpkgs/tree-sitter/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/tree-sitter-devel
 create mode 100644 srcpkgs/tree-sitter/template

diff --git a/common/shlibs b/common/shlibs
index 5e274cc8d8d..de9da1c194a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ liburing.so.1 liburing-0.7_1
 libbson-1.0.so.0 libbson-1.17.0_1
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
+libtree-sitter.so.0 tree-sitter-0.17.3_1
diff --git a/srcpkgs/tree-sitter-devel b/srcpkgs/tree-sitter-devel
new file mode 120000
index 00000000000..25ba75a1097
--- /dev/null
+++ b/srcpkgs/tree-sitter-devel
@@ -0,0 +1 @@
+tree-sitter/
\ No newline at end of file
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
new file mode 100644
index 00000000000..3130ba7eaf6
--- /dev/null
+++ b/srcpkgs/tree-sitter/template
@@ -0,0 +1,26 @@
+# Template file for 'tree-sitter'
+pkgname=tree-sitter
+version=0.17.3
+revision=1
+build_style=gnu-makefile
+short_desc="Parser generator tool and incremental parsing library"
+maintainer="Harrison Thorne <harrisonthorne@protonmail.com>"
+license="MIT"
+homepage="https://tree-sitter.github.io"
+distfiles="https://github.com/tree-sitter/${pkgname}/archive/${version}.tar.gz"
+checksum=a897e5c9a7ccb74271d9b20d59121d2d2e9de8b896c4d1cfaac0f8104c1ef9f8
+
+post_install() {
+	vlicense LICENSE
+}
+
+tree-sitter-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From e056101ecbbc8e5a5eb9e36a7bb100450f74c027 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Nov 2020 17:56:22 +0100
Subject: [PATCH 0002/3595] perl-Gtk3-ImageView: update to 6.

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

diff --git a/srcpkgs/perl-Gtk3-ImageView/template b/srcpkgs/perl-Gtk3-ImageView/template
index 25e76ae3459..6c9357bd0b0 100644
--- a/srcpkgs/perl-Gtk3-ImageView/template
+++ b/srcpkgs/perl-Gtk3-ImageView/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Gtk3-ImageView'
 pkgname=perl-Gtk3-ImageView
-version=4
+version=6
 revision=1
 wrksrc="gtk3-imageview-${version}"
 build_style=perl-module
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://github.com/carygravel/gtk3-imageview"
 distfiles="https://github.com/carygravel/gtk3-imageview/archive/v${version}.tar.gz"
-checksum=5c80af44e564e32a9698f034bc78b4e8332f2a59c630d162a388c15bad93c575
+checksum=e1c04181d318ff0794e843d277b89ceb2627ef347bca78bc518e0f04e56de1a5

From 1b5bace117aa7d6ea6a757dc3fa2296aa20684a8 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Mon, 31 Aug 2020 16:19:39 +0200
Subject: [PATCH 0003/3595] New package: seatd-0.4.0

The elogind build option is enabled by default so that we can enable
only the libseat wlroots backend by default. This is also the right
default if other projects start using seatd.
---
 common/shlibs                 |  1 +
 srcpkgs/libseat               |  1 +
 srcpkgs/libseat-devel         |  1 +
 srcpkgs/seatd/files/seatd/run |  2 ++
 srcpkgs/seatd/template        | 40 +++++++++++++++++++++++++++++++++++
 5 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/libseat
 create mode 120000 srcpkgs/libseat-devel
 create mode 100644 srcpkgs/seatd/files/seatd/run
 create mode 100644 srcpkgs/seatd/template

diff --git a/common/shlibs b/common/shlibs
index de9da1c194a..60758a359f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2978,6 +2978,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
 liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
+libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnm-gtk-1.4.0_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
diff --git a/srcpkgs/libseat b/srcpkgs/libseat
new file mode 120000
index 00000000000..c277276d33e
--- /dev/null
+++ b/srcpkgs/libseat
@@ -0,0 +1 @@
+seatd
\ No newline at end of file
diff --git a/srcpkgs/libseat-devel b/srcpkgs/libseat-devel
new file mode 120000
index 00000000000..c277276d33e
--- /dev/null
+++ b/srcpkgs/libseat-devel
@@ -0,0 +1 @@
+seatd
\ No newline at end of file
diff --git a/srcpkgs/seatd/files/seatd/run b/srcpkgs/seatd/files/seatd/run
new file mode 100644
index 00000000000..a7cf1b48a36
--- /dev/null
+++ b/srcpkgs/seatd/files/seatd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/seatd -g _seatd
diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
new file mode 100644
index 00000000000..d76d4d3a658
--- /dev/null
+++ b/srcpkgs/seatd/template
@@ -0,0 +1,40 @@
+# Template file for 'seatd'
+pkgname=seatd
+version=0.4.0
+revision=1
+build_style=meson
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled)"
+hostmakedepends="pkg-config scdoc"
+makedepends="$(vopt_if elogind elogind-devel)"
+short_desc="Minimal seat management daemon"
+maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+license="MIT"
+homepage="https://kl.wtf/projects/seatd/"
+distfiles="https://git.sr.ht/~kennylevinsen/seatd/archive/${version}.tar.gz"
+checksum=3c7458ff0c0d41ddd7734d01a5c5a9110ee5b94f01931e7e41ea0fd0c2e6050f
+system_groups=_seatd
+
+build_options="elogind"
+build_options_default="elogind"
+
+post_install() {
+	vlicense LICENSE
+	vsv seatd
+}
+
+libseat_package() {
+	short_desc="Universal seat management library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libseat-devel_package() {
+	depends="libseat>=${version}_${revision} ${makedepends}"
+	short_desc="Universal seat management library - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 968dd0e593848beea62ecfcd37d819996e280af7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 16 Nov 2020 11:02:23 -0600
Subject: [PATCH 0004/3595] i3-gaps: update to 4.19.

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

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index dbd9f5f0e20..916ef6729c2 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,10 +1,10 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.18.3
+version=4.19
 revision=1
 wrksrc="i3-${version}"
-build_style=gnu-configure
-configure_args="--disable-builddir"
+build_style=meson
+configure_args="-Dmans=true"
 hostmakedepends="pkg-config perl autoconf automake asciidoc pod2mdoc xmlto"
 makedepends="pcre-devel yajl-devel libxcb-devel libev-devel
  pango-devel startup-notification-devel libxkbcommon-devel
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=e87b5f5da1f026cf9261aec03de62305720cb0e7fd312245b2b9101aca6ad2ba
+checksum=dbd739dae5c16a94763dac0a7407d0307f0814f7bf48b99591b772820c874b4f
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"
@@ -26,14 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
 esac
 
-pre_configure() {
-	autoreconf -fi
-}
-
 pre_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-		vsed -i "/^LIBS =/s,$,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a," Makefile
+		vsed -i "/^common_deps/i glob_dep = cc.find_library('glob')" meson.build
+		vsed -i "/^common_deps/a glob_dep," meson.build
 		vsed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c
 		vsed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c
 		vsed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c
@@ -48,6 +45,4 @@ do_check() {
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
 	vlicense LICENSE
-	vmkdir usr/share/man/man1
-	install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1
 }

From aadd94a20bad1b029c656f04d68440d6a4b01f44 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 16 Nov 2020 09:40:09 -0600
Subject: [PATCH 0005/3595] i3: update to 4.19.

---
 srcpkgs/i3/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index cb23283d1a5..f3d9d6c9d00 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,9 +1,8 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.18.3
+version=4.19
 revision=1
-build_style=gnu-configure
-configure_args="--disable-builddir"
+build_style=meson
 hostmakedepends="pkg-config perl"
 makedepends="pcre-devel yajl-devel libxcb-devel libev-devel
  pango-devel startup-notification-devel libxkbcommon-devel
@@ -15,8 +14,8 @@ short_desc="Improved tiling window manager"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=53ae7903fad6eea830d58e949698e4a502c432c0d0a582659a0a59b1b995b10d
+distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz"
+checksum=aca48b03c0c70607826a1a91333065ff44d61774c152ddc9210fbc1627355872
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
@@ -25,10 +24,11 @@ esac
 pre_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-		sed -i "/^LIBS =/s,$,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a," Makefile
-		sed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c
-		sed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c
-		sed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c
+		vsed -i "/^common_deps/i glob_dep = cc.find_library('glob')" meson.build
+		vsed -i "/^common_deps/a glob_dep," meson.build
+		vsed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c
+		vsed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c
+		vsed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c
 		;;
 	esac
 }

From 3d5056c82679381120847b591085d9ad809fb91e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Nov 2020 07:33:33 -0600
Subject: [PATCH 0006/3595] autorandr: update to 1.11.

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

diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template
index 593fa5dbcd9..35977a52948 100644
--- a/srcpkgs/autorandr/template
+++ b/srcpkgs/autorandr/template
@@ -1,7 +1,7 @@
 # Template file for 'autorandr'
 pkgname=autorandr
-version=1.10.1
-revision=2
+version=1.11
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"
 depends="python3-setuptools xrandr"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/phillipberndt/autorandr"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=230fb9f3d5bf544a2547c01dbdda39812944cdd5465a679bb961769c7ddb552c
+checksum=47e61984c3b426929527fb693d88e3bf9ebb82da625a3f840a624aa3fd891ce3
 
 post_install() {
 	make install TARGETS='pmutils udev autostart_config bash_completion' \

From 9a1f9fbdf551788758b71986908cf6134f29eceb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Nov 2020 07:36:20 -0600
Subject: [PATCH 0007/3595] jadx: update to 1.2.0.

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

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index 550efcce0f7..d8f45469d62 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,14 +1,14 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.1.0
-revision=2
+version=1.2.0
+revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=86136f831e1e7889c012ddb5b874a014e1db6d615c805a9c832ec54ef22e292c
+checksum=f2d1a3a8ee6782c02f77eb1f77f94f028f725ccd4d5a7ec0b9fcca330de95b33
 
 do_build() {
 	gradle copyArtifacts

From 922eeb301ae504bec903dcc59e503048fe2143ba Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 16 Nov 2020 13:40:28 -0600
Subject: [PATCH 0008/3595] ghidra: update to 9.2.

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

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index d987431140f..b96fb5df84d 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,6 +1,6 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=9.1.2
+version=9.2
 revision=1
 archs="x86_64*"
 create_wrksrc=yes
@@ -15,7 +15,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://sourceforge.net/projects/catacombae/files/HFSExplorer/0.21/hfsexplorer-0_21-bin.zip
  https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-12.12/yajsw-stable-12.12.zip
  https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar"
-checksum="5c8808233ff14ede37b001c34faf41c51e6a05f4e51c4d0770f420e3a548f758
+checksum="1ad28e59417b3a503361bf871e97d20dd0f7eb23bf0e87decd1e7a003d113c3e
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  90c9b54798abca5b12f4a678db7d0a4c970f4702cb153c11919536d0014dedbf
  1398fcb1e93abb19992c4fa06d7fe5758aabb4c45781d7ef306c6f57ca7a7321

From 2d1505f1fd8ef66078df246c8a006896cc2355d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Nov 2020 21:03:30 +0100
Subject: [PATCH 0009/3595] adwaita-qt: ignore unstable releases

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

diff --git a/srcpkgs/adwaita-qt/update b/srcpkgs/adwaita-qt/update
new file mode 100644
index 00000000000..f253ba1aa92
--- /dev/null
+++ b/srcpkgs/adwaita-qt/update
@@ -0,0 +1 @@
+ignore="*.9[0-9]"

From 37da77fa6c24f5579bc83d01ab1bbc107aa910ab Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Nov 2020 09:39:10 -0600
Subject: [PATCH 0010/3595] libredwg: update to 0.11.1.

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

diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index b42a24226d8..90febf9a370 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,6 +1,6 @@
 # Template file for 'libredwg'
 pkgname=libredwg
-version=0.11
+version=0.11.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-bindings"
@@ -11,7 +11,7 @@ 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=43eb08c6becfbc654fe82d648d57c9741ced27be81d07668cb537bcfabcc5f6c
+checksum=e96499ed0db8fc19d733e2df1e04d155cca2d1baaaac6d78ac8efd4d4f8a224b
 
 libredwg-tools_package() {
 	short_desc+=" - utilities"

From c8a3f19b8c8e71215b23864516acb23de3a7a52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 6 Nov 2020 11:35:39 -0300
Subject: [PATCH 0011/3595] musl: add patch for aarch64 fregs and vregs.

Necessary for building elfutils for aarch64 without patches.
---
 srcpkgs/musl/patches/aarch64-fregs.patch | 37 ++++++++++++++++++++++++
 srcpkgs/musl/template                    |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/aarch64-fregs.patch

diff --git a/srcpkgs/musl/patches/aarch64-fregs.patch b/srcpkgs/musl/patches/aarch64-fregs.patch
new file mode 100644
index 00000000000..9c89de44732
--- /dev/null
+++ b/srcpkgs/musl/patches/aarch64-fregs.patch
@@ -0,0 +1,37 @@
+Use types compatible with glibc/kernel headers.
+
+diff --git a/arch/aarch64/bits/signal.h b/arch/aarch64/bits/signal.h
+index b71261f5..5098c734 100644
+--- arch/aarch64/bits/signal.h
++++ arch/aarch64/bits/signal.h
+@@ -11,7 +11,7 @@ typedef unsigned long greg_t;
+ typedef unsigned long gregset_t[34];
+ 
+ typedef struct {
+-	long double vregs[32];
++	__uint128_t vregs[32];
+ 	unsigned int fpsr;
+ 	unsigned int fpcr;
+ } fpregset_t;
+@@ -34,7 +34,7 @@ struct fpsimd_context {
+ 	struct _aarch64_ctx head;
+ 	unsigned int fpsr;
+ 	unsigned int fpcr;
+-	long double vregs[32];
++	__uint128_t vregs[32];
+ };
+ struct esr_context {
+ 	struct _aarch64_ctx head;
+diff --git a/arch/aarch64/bits/user.h b/arch/aarch64/bits/user.h
+index d12cdf7f..8a1002aa 100644
+--- arch/aarch64/bits/user.h
++++ arch/aarch64/bits/user.h
+@@ -6,7 +6,7 @@ struct user_regs_struct {
+ };
+ 
+ struct user_fpsimd_struct {
+-	long double vregs[32];
++	__uint128_t vregs[32];
+ 	unsigned int fpsr;
+ 	unsigned int fpcr;
+ };
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 22e79588acd..6a0ac60b03c 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=3
+revision=4
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From 604b5c55ffc0dcabde69039380fdacc2c850083b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 6 Nov 2020 11:36:42 -0300
Subject: [PATCH 0012/3595] cross-aarch64-linux-musl: revbump to apply musl
 patch.

Patch can be seen in the commit before this one.
---
 srcpkgs/cross-aarch64-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5ce33afe375..48d3c201d06 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.33
-revision=3
+revision=4
 short_desc="Cross toolchain for ARM64 LE target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"

From 6460c54d26f53dc957af8342cd9b5cca180e644c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 25 Oct 2020 18:57:17 -0300
Subject: [PATCH 0013/3595] elfutils: update to 0.182, add debuginfod subpkgs,
 adopt.

Cleaned up patches, remove the aarch64-fregs one (it was fixed with a
musl patch, instead), and moved closer to where upstream is moving
regarding musl compat.
---
 common/shlibs                                 |   1 +
 srcpkgs/debuginfod                            |   1 +
 srcpkgs/elfutils/patches/debuginfod.patch     |  13 ++
 .../elfutils/patches/fix-aarch64_fregs.patch  |  14 ---
 .../elfutils/patches/fix-uninitialized.patch  |  11 --
 srcpkgs/elfutils/patches/fts-obstack.patch    | 107 ++++++++++++++++
 srcpkgs/elfutils/patches/musl-cdefs.patch     |  30 -----
 .../elfutils/patches/musl-fts-obstack.patch   |  87 -------------
 srcpkgs/elfutils/patches/musl-macros.patch    | 118 ++++++++++--------
 srcpkgs/elfutils/patches/musl-strndupa.patch  |  18 ---
 srcpkgs/elfutils/template                     |  37 ++++--
 srcpkgs/libdebuginfod                         |   1 +
 12 files changed, 216 insertions(+), 222 deletions(-)
 create mode 120000 srcpkgs/debuginfod
 create mode 100644 srcpkgs/elfutils/patches/debuginfod.patch
 delete mode 100644 srcpkgs/elfutils/patches/fix-aarch64_fregs.patch
 delete mode 100644 srcpkgs/elfutils/patches/fix-uninitialized.patch
 create mode 100644 srcpkgs/elfutils/patches/fts-obstack.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-cdefs.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-fts-obstack.patch
 delete mode 100644 srcpkgs/elfutils/patches/musl-strndupa.patch
 create mode 120000 srcpkgs/libdebuginfod

diff --git a/common/shlibs b/common/shlibs
index 60758a359f8..d896815d3ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -737,6 +737,7 @@ libmtp.so.9 libmtp-1.1.4_1
 libelf.so.1 libelf-0.155_1
 libdw.so.1 libelf-0.155_1
 libasm.so.1 libelf-0.155_1
+libdebuginfod.so.1 libdebuginfod-0.182_1
 libgtksourceview-3.0.so.1 gtksourceview-3.8.0_1
 libtalloc.so.2 talloc-2.0.1_1
 libmount.so.1 libmount-2.18_1
diff --git a/srcpkgs/debuginfod b/srcpkgs/debuginfod
new file mode 120000
index 00000000000..b76b36cfac4
--- /dev/null
+++ b/srcpkgs/debuginfod
@@ -0,0 +1 @@
+elfutils
\ No newline at end of file
diff --git a/srcpkgs/elfutils/patches/debuginfod.patch b/srcpkgs/elfutils/patches/debuginfod.patch
new file mode 100644
index 00000000000..d26d945d1ff
--- /dev/null
+++ b/srcpkgs/elfutils/patches/debuginfod.patch
@@ -0,0 +1,13 @@
+diff --git debuginfod/debuginfod.cxx debuginfod/debuginfod.cxx
+index 3085f388..d2a434ee 100644
+--- debuginfod/debuginfod.cxx
++++ debuginfod/debuginfod.cxx
+@@ -46,7 +46,7 @@ extern "C" {
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <error.h>
+-// #include <libintl.h> // not until it supports C++ << better
++#include <libintl.h>
+ #include <locale.h>
+ #include <pthread.h>
+ #include <signal.h>
diff --git a/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch b/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch
deleted file mode 100644
index e9641542144..00000000000
--- a/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-It looks like fregs.vregs[] is an array of double?
-Casting to Dwarf_Word instead of & 0xFFFFFFF should do.
-
---- backends/aarch64_initreg.c	2015-11-27 14:36:29.000000000 +0100
-+++ backends/aarch64_initreg.c	2016-08-09 03:47:25.428560159 +0200
-@@ -82,7 +83,7 @@
- 
-   Dwarf_Word dwarf_fregs[32];
-   for (int r = 0; r < 32; r++)
--    dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF;
-+    dwarf_fregs[r] = (Dwarf_Word)fregs.vregs[r];
- 
-   if (! setfunc (64, 32, dwarf_fregs, arg))
-     return false;
diff --git a/srcpkgs/elfutils/patches/fix-uninitialized.patch b/srcpkgs/elfutils/patches/fix-uninitialized.patch
deleted file mode 100644
index 6ab15e50e2b..00000000000
--- a/srcpkgs/elfutils/patches/fix-uninitialized.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-
---- libcpu/i386_disasm.c	2015-08-21 14:22:37.000000000 +0200
-+++ libcpu/i386_disasm.c	2015-11-20 06:30:59.250629957 +0100
-@@ -710,6 +710,7 @@
- 
- 		case 'm':
- 		  /* Mnemonic.  */
-+		  str = mnebuf;
- 
- 		  if (unlikely (instrtab[cnt].mnemonic == MNE_INVALID))
- 		    {
diff --git a/srcpkgs/elfutils/patches/fts-obstack.patch b/srcpkgs/elfutils/patches/fts-obstack.patch
new file mode 100644
index 00000000000..44ef0aee70e
--- /dev/null
+++ b/srcpkgs/elfutils/patches/fts-obstack.patch
@@ -0,0 +1,107 @@
+diff --git ChangeLog ChangeLog
+index 128da6c6..565d021c 100644
+--- ChangeLog
++++ ChangeLog
+@@ -1,3 +1,7 @@
++2020-11-01  Érico N. Rolim  <erico.erc@gmail.com>
++
++	* configure.ac: Check for fts and obstack from outside libc.
++
+ 2020-10-28  Mark Wielaard  <mark@klomp.org>
+ 
+ 	* configure.ac: Set version to 0.182.
+diff --git configure.ac configure.ac
+index 515ac704..c1a6954d 100644
+--- configure.ac
++++ configure.ac
+@@ -542,6 +542,26 @@ else
+ fi
+ AC_SUBST([argp_LDADD])
+ 
++saved_LIBS="$LIBS"
++AC_SEARCH_LIBS([fts_close], [fts])
++LIBS="$saved_LIBS"
++case "$ac_cv_search_fts_close" in
++        no) AC_MSG_FAILURE([failed to find fts_close]) ;;
++        -l*) fts_LIBS="$ac_cv_search_fts_close" ;;
++        *) fts_LIBS= ;;
++esac
++AC_SUBST([fts_LIBS])
++
++saved_LIBS="$LIBS"
++AC_SEARCH_LIBS([_obstack_free], [obstack])
++LIBS="$saved_LIBS"
++case "$ac_cv_search__obstack_free" in
++        no) AC_MSG_FAILURE([failed to find obstack_free]) ;;
++        -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;;
++        *) obstack_LIBS= ;;
++esac
++AC_SUBST([obstack_LIBS])
++
+ dnl The directories with content.
+ 
+ dnl Documentation.
+diff --git debuginfod/Makefile.am debuginfod/Makefile.am
+index 01985600..0af3b58c 100644
+--- debuginfod/Makefile.am
++++ debuginfod/Makefile.am
+@@ -71,10 +71,10 @@ bin_PROGRAMS += debuginfod-find
+ endif
+ 
+ debuginfod_SOURCES = debuginfod.cxx
+-debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
++debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
+ 
+ debuginfod_find_SOURCES = debuginfod-find.c
+-debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod)
++debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS)
+ 
+ if LIBDEBUGINFOD
+ noinst_LIBRARIES = libdebuginfod.a
+@@ -98,7 +98,7 @@ libdebuginfod_so_LIBS = libdebuginfod_pic.a
+ if DUMMY_LIBDEBUGINFOD
+ libdebuginfod_so_LDLIBS =
+ else
+-libdebuginfod_so_LDLIBS = $(libcurl_LIBS)
++libdebuginfod_so_LDLIBS = $(libcurl_LIBS) $(fts_LIBS)
+ endif
+ libdebuginfod.so$(EXEEXT): $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS)
+ 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
+diff --git libdw/Makefile.am libdw/Makefile.am
+index 33b5838d..1dbb3d5e 100644
+--- libdw/Makefile.am
++++ libdw/Makefile.am
+@@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \
+ 		../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
+ 		../libdwfl/libdwfl_pic.a
+ libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
+-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LIBS) $(obstack_LIBS) $(zip_LIBS) -pthread
+ libdw_so_SOURCES =
+ libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
+ 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
+diff --git src/Makefile.am src/Makefile.am
+index e462e7d7..88d0ac8f 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -69,7 +69,7 @@ ar_no_Wstack_usage = yes
+ unstrip_no_Wstack_usage = yes
+ 
+ readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD)
+-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \
++nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS) \
+ 	   $(demanglelib)
+ size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
+ strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
+@@ -78,9 +78,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
+ addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
+ elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
+ objdump_LDADD  = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
+-ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
++ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
+ strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
+-ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
++ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
+ unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
+ stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib)
+ elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
diff --git a/srcpkgs/elfutils/patches/musl-cdefs.patch b/srcpkgs/elfutils/patches/musl-cdefs.patch
deleted file mode 100644
index 65ef9f4d23c..00000000000
--- a/srcpkgs/elfutils/patches/musl-cdefs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- libelf/elf.h	2015-08-21 14:22:37.000000000 +0200
-+++ libelf/elf.h	2015-11-20 04:54:33.948081321 +0100
-@@ -21,6 +21,17 @@
- 
- #include <features.h>
- 
-+#if !defined(__BEGIN_DECLS)
-+/* C++ needs to know that types and declarations are C, not C++.  */
-+#ifdef  __cplusplus
-+# define __BEGIN_DECLS  extern "C" {
-+# define __END_DECLS    }
-+#else
-+# define __BEGIN_DECLS
-+# define __END_DECLS
-+#endif
-+#endif
-+
- __BEGIN_DECLS
- 
- /* Standard ELF types.  */
---- lib/fixedsizehash.h.orig
-+++ lib/fixedsizehash.h
-@@ -30,7 +30,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/cdefs.h>
- 
- #include <system.h>
- 
diff --git a/srcpkgs/elfutils/patches/musl-fts-obstack.patch b/srcpkgs/elfutils/patches/musl-fts-obstack.patch
deleted file mode 100644
index 77e3c4ea040..00000000000
--- a/srcpkgs/elfutils/patches/musl-fts-obstack.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- configure.ac	2015-10-15 15:16:57.000000000 +0200
-+++ configure.ac	2015-11-20 05:32:57.723901582 +0100
-@@ -305,6 +305,62 @@
- fi
- AC_SUBST([argp_LDADD])
- 
-+dnl Check if we have fts available from our libc
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM(
-+		[#if !defined(__x86_64__)
-+		#undef  _FILE_OFFSET_BITS
-+		#define _FILE_OFFSET_BITS 32
-+		#endif
-+		#include <fts.h>],
-+		[FTS* fts = 0; return fts_close(fts); return 0;]
-+		)],
-+	[libc_has_fts="true"],
-+	[libc_has_fts="false"]
-+)
-+
-+dnl If our libc doesn't provide fts, then test for libfts
-+if test "$libc_has_fts" = "false" ; then
-+	AC_MSG_WARN("libc does not have fts")
-+	AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"])
-+
-+	if test "$have_fts" = "false"; then
-+		AC_MSG_ERROR("no libfts found")
-+	else
-+		fts_LDADD="-lfts"
-+	fi
-+else
-+	fts_LDADD=""
-+fi
-+AC_SUBST([fts_LDADD])
-+
-+dnl Check if we have obstack available from our libc
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM(
-+		[#include <obstack.h>],
-+		[_obstack_begin(0, 0, 0, NULL, NULL); return 0;]
-+		)],
-+	[libc_has_obstack="true"],
-+	[libc_has_obstack="false"]
-+)
-+
-+dnl If our libc doesn't provide obstack, then test for libobstack
-+if test "$libc_has_obstack" = "false" ; then
-+	AC_MSG_WARN("libc does not have obstack")
-+	AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"])
-+
-+	if test "$have_obstack" = "false"; then
-+		AC_MSG_ERROR("no libobstack found")
-+	else
-+		obstack_LDADD="-lobstack"
-+	fi
-+else
-+	obstack_LDADD=""
-+fi
-+AC_SUBST([obstack_LDADD])
-+
-+dnl The directories with content.
-+
- dnl The directories with content.
- 
- dnl Documentation.
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -46,7 +46,7 @@
- else
- libasm = ../libasm/libasm.so
- libdw = ../libdw/libdw.so
--libelf = ../libelf/libelf.so
-+libelf = ../libelf/libelf.so $(fts_LDADD) $(obstack_LDADD)
- endif
- libebl = ../libebl/libebl.a
- libeu = ../lib/libeu.a
---- libdw/Makefile.am.orig
-+++ libdw/Makefile.am
-@@ -109,7 +109,7 @@
- 		../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
- 		../libdwfl/libdwfl_pic.a
- libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
--libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
-+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) -pthread
- libdw_so_SOURCES =
- libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
- 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch
index 8ce586b2930..97a8c2bf352 100644
--- a/srcpkgs/elfutils/patches/musl-macros.patch
+++ b/srcpkgs/elfutils/patches/musl-macros.patch
@@ -1,66 +1,74 @@
---- src/arlib.h	2015-08-21 14:22:37.000000000 +0200
-+++ src/arlib.h	2015-11-20 08:02:55.153199611 +0100
-@@ -29,6 +29,16 @@
- #include <stdint.h>
- #include <sys/types.h>
+diff --git debuginfod/debuginfod-client.c debuginfod/debuginfod-client.c
+index 0e5177bc..ce1d819b 100644
+--- debuginfod/debuginfod-client.c
++++ debuginfod/debuginfod-client.c
+@@ -212,13 +212,13 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
+     return 0;
  
-+#if !defined(ACCESSPERMS)
-+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-+#endif
-+#if !defined(ALLPERMS)
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
-+#endif
-+#if !defined(DEFFILEMODE)
-+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
-+#endif
-+
+   /* Create the cache and config files as necessary.  */
+-  if (stat(cache_path, &st) != 0 && mkdir(cache_path, 0777) < 0)
++  if (stat(cache_path, &st) != 0 && mkdir(cache_path, ACCESSPERMS) < 0)
+     return -errno;
  
- /* State of -D/-U flags.  */
- extern bool arlib_deterministic_output;
---- src/elfcompress.c.orig	2016-04-02 12:51:26.903848894 +0200
-+++ src/elfcompress.c	2016-04-02 12:55:15.076996338 +0200
-@@ -35,6 +35,14 @@
- #include <gelf.h>
- #include "system.h"
+   int fd = -1;
  
-+#if !defined(FNM_EXTMATCH)
-+# define FNM_EXTMATCH 0
-+#endif
-+
-+#if !defined(ALLPERMS)
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
+   /* init cleaning interval config file.  */
+-  fd = open(interval_path, O_CREAT | O_RDWR, 0666);
++  fd = open(interval_path, O_CREAT | O_RDWR, DEFFILEMODE);
+   if (fd < 0)
+     return -errno;
+ 
+@@ -227,7 +227,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
+ 
+   /* init max age config file.  */
+   if (stat(maxage_path, &st) != 0
+-      && (fd = open(maxage_path, O_CREAT | O_RDWR, 0666)) < 0)
++      && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
+     return -errno;
+ 
+   if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0)
+diff --git lib/system.h lib/system.h
+index 292082bd..5d16ebc6 100644
+--- lib/system.h
++++ lib/system.h
+@@ -85,6 +85,18 @@
+      __res; })
+ #endif
+ 
++#ifndef ACCESSPERMS
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
 +#endif
 +
- /* Name and version of program.  */
- static void print_version (FILE *stream, struct argp_state *state);
- ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
---- src/strip.c.orig	2017-08-02 12:06:25.000000000 +0000
-+++ src/strip.c	2017-08-05 01:58:01.523493062 +0000
-@@ -47,6 +47,14 @@
- #include <system.h>
- #include <printversion.h>
- 
-+#if !defined(FNM_EXTMATCH)
-+# define FNM_EXTMATCH 0
++#ifndef ALLPERMS
++#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
 +#endif
 +
-+#if !defined(ACCESSPERMS)
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
++#ifndef DEFFILEMODE
++#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* DEFFILEMODE*/
 +#endif
 +
- typedef uint8_t GElf_Byte;
+ static inline ssize_t __attribute__ ((unused))
+ pwrite_retry (int fd, const void *buf, size_t len, off_t off)
+ {
+diff --git src/unstrip.c src/unstrip.c
+index 0257d9cc..c99ee612 100644
+--- src/unstrip.c
++++ src/unstrip.c
+@@ -315,7 +315,7 @@ make_directories (const char *path)
+   if (dir == NULL)
+     error(EXIT_FAILURE, errno, _("memory exhausted"));
  
- /* Name and version of program.  */
---- tests/elfstrmerge.c.orig	2020-09-13 08:20:50.538492600 +0700
-+++ tests/elfstrmerge.c	2020-09-13 08:21:40.205734827 +0700
-@@ -33,6 +33,10 @@
- #include ELFUTILS_HEADER(dwelf)
- #include "elf-knowledge.h"
+-  while (mkdir (dir, 0777) < 0 && errno != EEXIST)
++  while (mkdir (dir, ACCESSPERMS) < 0 && errno != EEXIST)
+     {
+       if (errno == ENOENT)
+         make_directories (dir);
+@@ -2192,7 +2192,7 @@ DWARF data in '%s' not adjusted for prelinking bias; consider prelink -u"),
  
-+#if !defined(ALLPERMS)
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
-+#endif
-+
- /* The original ELF file.  */
- static int fd = -1;
- static Elf *elf = NULL;
+       /* Copy the unstripped file and then modify it.  */
+       int outfd = open (output_file, O_RDWR | O_CREAT,
+-			  stripped_ehdr->e_type == ET_REL ? 0666 : 0777);
++			  stripped_ehdr->e_type == ET_REL ? DEFFILEMODE : ACCESSPERMS);
+       if (outfd < 0)
+ 	error (EXIT_FAILURE, errno, _("cannot open '%s'"), output_file);
+       Elf *outelf = elf_begin (outfd, ELF_C_WRITE, NULL);
diff --git a/srcpkgs/elfutils/patches/musl-strndupa.patch b/srcpkgs/elfutils/patches/musl-strndupa.patch
deleted file mode 100644
index f365fb019f2..00000000000
--- a/srcpkgs/elfutils/patches/musl-strndupa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/unstrip.c.orig	2017-04-27 14:26:26.000000000 +0000
-+++ src/unstrip.c	2017-05-05 15:51:33.515154220 +0000
-@@ -56,6 +56,15 @@
- # define _(str) gettext (str)
- #endif
- 
-+#ifndef strndupa
-+#define strndupa(s, n) \
-+       (__extension__ ({const char *__in = (s);                    \
-+                        size_t __len = strnlen (__in, (n)) + 1;    \
-+                        char *__out = (char *) alloca (__len);     \
-+                        __out[__len-1] = '\0';                     \
-+                        (char *) memcpy (__out, __in, __len-1);}))
-+#endif
-+
- /* Name and version of program.  */
- ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
- 
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 02e6e20c64b..99159a2be41 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,22 +1,26 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.181
+version=0.182
 revision=1
 build_style=gnu-configure
-configure_args="--program-prefix=eu- --disable-debuginfod --disable-libdebuginfod"
+configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"
-makedepends="bzip2-devel liblzma-devel zlib-devel"
+makedepends="bzip2-devel liblzma-devel zlib-devel
+ libcurl-devel libarchive-devel sqlite-devel libmicrohttpd-devel"
 short_desc="Utilities to handle ELF object files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3
+checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858
 
 CFLAGS="-Wno-error"
+CXXFLAGS="-Wl,-z,stack-size=2097152"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel"
+	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel musl-legacy-compat"
+	# XXX: breaks some expected functionality
+	CFLAGS+=" -DFNM_EXTMATCH=0"
 fi
 
 post_extract() {
@@ -30,6 +34,23 @@ pre_configure() {
 	autoreconf -if
 }
 
+libdebuginfod_package() {
+	short_desc+=" - debuginfod library"
+	pkg_install() {
+		vmove "usr/lib/libdebuginfod-*.so*"
+		vmove etc/profile.d
+	}
+}
+
+debuginfod_package() {
+	short_desc+=" - debuginfod programs"
+	pkg_install() {
+		vmove "usr/bin/debuginfod*"
+		vmove "usr/share/man/man1/debuginfod-find.1"
+		vmove "usr/share/man/man8/debuginfod.8"
+	}
+}
+
 libelf_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -38,11 +59,13 @@ libelf_package() {
 }
 
 elfutils-devel_package() {
-	depends="libelf>=${version}_${revision} ${makedepends}"
+	depends="libelf>=${version}_${revision} libdebuginfod>=${version}_${revision}
+	 ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
 	}
 }
diff --git a/srcpkgs/libdebuginfod b/srcpkgs/libdebuginfod
new file mode 120000
index 00000000000..b76b36cfac4
--- /dev/null
+++ b/srcpkgs/libdebuginfod
@@ -0,0 +1 @@
+elfutils
\ No newline at end of file

From 83cc14db7183bb8bbef3a7a1a597fe69686760c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 25 Oct 2020 18:23:45 -0300
Subject: [PATCH 0014/3595] gdb: add debuginfod option, enable by default.

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

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 0e2e399e798..e2a39e7d103 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,16 +1,18 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
- $(vopt_if python --with-python=/usr/bin/python3)"
-hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
+ $(vopt_if python --with-python=/usr/bin/python3)
+ $(vopt_with debuginfod)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-libs')"
+ $(vopt_if python 'python3-devel gettext-libs')
+ $(vopt_if debuginfod elfutils-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -28,10 +30,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python"
+build_options="gdbserver static python debuginfod"
 desc_option_gdbserver="Enable support for building GDB server"
+desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python"
+build_options_default="gdbserver python debuginfod"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 

From 5971754fb656bc0baeecb903114b6d046f8611c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Nov 2020 10:34:14 +0100
Subject: [PATCH 0015/3595] ocaml-num: update to 1.4.

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

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index ac4bf0f7666..1a9282ac2e5 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
-version=1.3
-revision=3
+version=1.4
+revision=1
 build_style=gnu-makefile
 makedepends="ocaml ocaml-findlib"
 make_install_target="findlib-install"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1"
 homepage="https://github.com/ocaml/num"
 distfiles="https://github.com/ocaml/num/archive/v${version}.tar.gz"
-checksum=4f79c30e81ea9553c5b2c5b5b57bb19968ccad1e85256b3c446b5df58f33e94d
+checksum=015088b68e717b04c07997920e33c53219711dfaf36d1196d02313f48ea00f24
 wrksrc="num-${version}"
 nocross=yes
 

From 888c8997ca36b0400954a9b3303f6ffc63f015ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Nov 2020 11:05:44 +0100
Subject: [PATCH 0016/3595] coq: update to 8.12.1.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index d700c176c63..01a7829b50f 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.12.0
+version=8.12.1
 revision=1
 hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
 short_desc="Proof assistant written in OCaml"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=ecde14c6132f5abb459e7f4724788788928174ad4484fff88e86b0086779bcee
+checksum=dabad911239c69ecf79931b513cb427101c2f15f0451af056fbf181df526f8a5
 nopie=yes
 nocross=yes
 

From 6fbd49aacf953fd6ddb556b0a392c4e0e7e6c1a9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Nov 2020 11:06:02 +0100
Subject: [PATCH 0017/3595] mathcomp: rebuild for coq-8.12.1.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index f0c374f2279..87d621b48a5 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.11.0
-revision=2
+revision=3
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 00be36d6eaac3d7c29abe2349c657bc9752da033 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Nov 2020 11:41:43 +0100
Subject: [PATCH 0018/3595] k9s: update to 0.23.10.

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

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 3be876d20fd..ba3adca3e00 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.23.9
+version=0.23.10
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=9608b16b60ec6b39b7a3de1ab5bb75fca00d22844bb9c81107eace65302c7038
+checksum=63ebe6a8f87bcf82b20226357fbbe7a39574e84596979767af7bbb8023f19054

From 6d9cd616ab0aed20d97b94b4fecd8a35864b7c9d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Nov 2020 11:41:47 +0100
Subject: [PATCH 0019/3595] python3-boto3: update to 1.16.19.

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

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index ab82ee30c49..8d32ad71612 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.12
+version=1.16.19
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=51f701dd27f78a844edc24dd3e01ed21f2084037041d1be614e972a995ae44e8
+checksum=5593164dc333131059c338e525eefeabe1d5195479e963e3a6cfb45ccff13c45
 
 post_install() {
 	vlicense LICENSE

From 8ac6007f6b86bdd2401a103df31838394c5e6898 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Nov 2020 16:12:05 +0100
Subject: [PATCH 0020/3595] ndhc: update to 20201020.

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

diff --git a/srcpkgs/ndhc/template b/srcpkgs/ndhc/template
index 0dc34f466dc..01173c8477a 100644
--- a/srcpkgs/ndhc/template
+++ b/srcpkgs/ndhc/template
@@ -1,7 +1,8 @@
 # Template file for 'ndhc'
 pkgname=ndhc
-version=20180218
-revision=2
+version=20201020
+revision=1
+_dashversion=2020-10-20
 build_style=cmake
 make_dirs="/var/lib/ndhc/state 0755 root root
  /var/lib/ndhc/jail/dev 0755 root root"
@@ -11,13 +12,9 @@ short_desc="Privilege-seperated secure DHCPv4 client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/niklata/ndhc"
-_ndhcsum=e08d3b15b53f54ae47993e229bfd40ed3d643f86
-_libsum=fb9ee14a9e343d83fcf9d761de719d8410168e71
-distfiles="https://github.com/niklata/ndhc/archive/$_ndhcsum.tar.gz
- https://github.com/niklata/ncmlib/archive/$_libsum.tar.gz"
-checksum="704dd0f9a340b7e3faaf054c119832d749525d83b3364114151a88853ea6ae53
- 6b47f624f17616dbebfec223b1b57c745e6d6dbd5d678ee898666651f37e1355"
-wrksrc="ndhc-$_ndhcsum"
+distfiles="https://github.com/niklata/ndhc/archive/v${_dashversion}.tar.gz"
+checksum=ca5a37afc3f30c9fd110e97339a10b3c8ed08ae6cad388cec6bdd7f3bb146da0
+wrksrc="ndhc-${_dashversion}"
 
 # XXX we use only one account for privsep, not three, because they
 # should have the same primary group.  to be verified.
@@ -29,12 +26,8 @@ if [ "$build_option_static" ]; then
 	LDFLAGS+=" -static"
 fi
 
-post_extract() {
-	mv $XBPS_BUILDDIR/ncmlib-* $wrksrc/ncmlib
-}
-
 do_install() {
-	vbin build/src/ndhc
+	vbin build/ndhc
 	vman src/ndhc.8
 	vsv ndhc
 	vlicense LICENSE

From f79da01142a7301ae4d3f8c09fc6ad2d499208dd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Nov 2020 11:43:35 +0100
Subject: [PATCH 0021/3595] ugrep: update to 3.0.5.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index c9acda015c3..130cbee8f20 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.0.4
+version=3.0.5
 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=807f722cabe6832910b1cdc5f52e66079dafb9992481095c08ed8abae672e6a2
+checksum=b541390fdacfa8f91664ebd3d8e27efb8efc0a1972ef377dc166fabe603485c7

From d1ed98b84ddb25707dfdce4a97f9cccfb92c67b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Nov 2020 11:45:42 +0100
Subject: [PATCH 0022/3595] bpftrace: update to 0.11.4.

---
 ...trace-001-six-args-bpf_attach_uprobe.patch | 126 ---------------
 ...ace-002-seven-args-bpf_attach_uprobe.patch | 148 ------------------
 srcpkgs/bpftrace/template                     |  10 +-
 3 files changed, 2 insertions(+), 282 deletions(-)
 delete mode 100644 srcpkgs/bpftrace/files/bpftrace-001-six-args-bpf_attach_uprobe.patch
 delete mode 100644 srcpkgs/bpftrace/files/bpftrace-002-seven-args-bpf_attach_uprobe.patch

diff --git a/srcpkgs/bpftrace/files/bpftrace-001-six-args-bpf_attach_uprobe.patch b/srcpkgs/bpftrace/files/bpftrace-001-six-args-bpf_attach_uprobe.patch
deleted file mode 100644
index e2b1ad1351b..00000000000
--- a/srcpkgs/bpftrace/files/bpftrace-001-six-args-bpf_attach_uprobe.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 52fb793c6423c19696e07cc14ad5f9182f7eca0e Mon Sep 17 00:00:00 2001
-From: Viktor Malik <viktor.malik@gmail.com>
-Date: Wed, 12 Aug 2020 09:45:29 +0200
-Subject: [PATCH] Feature-detect bpf_attach_kprobe signature
-
-The function has 6 parameters in current versions of BCC and 5
-parameters in older versions.
-
-This is detected in CMake using CHECK_CXX_SOURCE_COMPILES. For static
-compilation, we also need to retrieve and link static libbpf, libelf,
-and libz. This may cause libbpf, libelf and libz to be searched for
-twice, but it should be fine since CMake caches results.
-
-Fixes iovisor#1027.
----
- cmake/FindLibBcc.cmake | 24 ++++++++++++++++++++++++
- src/CMakeLists.txt     |  3 +++
- src/attached_probe.cpp | 31 ++++++++++++++-----------------
- tests/CMakeLists.txt   |  3 +++
- 4 files changed, 44 insertions(+), 17 deletions(-)
-
-diff --git a/cmake/FindLibBcc.cmake b/cmake/FindLibBcc.cmake
-index 9d30b04bc..ec216271d 100644
---- a/cmake/FindLibBcc.cmake
-+++ b/cmake/FindLibBcc.cmake
-@@ -70,3 +70,27 @@ include (FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibBcc "Please install the bcc library package, which is required. Depending on your distro, it may be called bpfcclib or bcclib (Ubuntu), bcc-devel (Fedora), or something else. If unavailable, install bcc from source (github.com/iovisor/bcc)."
-   LIBBCC_LIBRARIES
-   LIBBCC_INCLUDE_DIRS)
-+
-+# Check bpf_attach_kprobe signature
-+if(${LIBBCC_FOUND})
-+if(STATIC_LINKING)
-+  # libbcc.a is not statically linked with libbpf.a, libelf.a, and libz.a.
-+  # If we do a static bpftrace build, we must link them in.
-+  find_package(LibBpf)
-+  find_package(LibElf)
-+  find_package(LibZ)
-+  SET(CMAKE_REQUIRED_LIBRARIES ${LIBBCC_BPF_LIBRARY_STATIC} ${LIBBPF_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBZ_LIBRARIES})
-+else()
-+  SET(CMAKE_REQUIRED_LIBRARIES ${LIBBCC_LIBRARIES})
-+endif()
-+INCLUDE(CheckCXXSourceCompiles)
-+CHECK_CXX_SOURCE_COMPILES("
-+#include <bcc/libbpf.h>
-+
-+int main(void) {
-+  bpf_attach_kprobe(0, BPF_PROBE_ENTRY, \"\", \"\", 0, 0);
-+  return 0;
-+}
-+" LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+SET(CMAKE_REQUIRED_LIBRARIES)
-+endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 647a23f1c..448a045fc 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -80,6 +80,9 @@ if(HAVE_BFD_DISASM)
-     target_link_libraries(bpftrace ${LIBOPCODES_LIBRARIES})
-   endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
-+if(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+  target_compile_definitions(bpftrace PRIVATE LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+endif(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
- 
- if (ALLOW_UNSAFE_PROBE)
-   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index 587a11576..afad9ed18 100644
---- a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -754,26 +754,23 @@ void AttachedProbe::load_prog()
-   }
- }
- 
--// XXX(mmarchini): bcc changed the signature of bpf_attach_kprobe, adding a new
--// int parameter at the end. Since there's no reliable way to feature-detect
--// this, we create a function pointer with the long signature and cast
--// bpf_attach_kprobe to this function pointer. If we're on an older bcc
--// version, bpf_attach_kprobe call will be augmented with an extra register
--// being used for the last parameter, even though this register won't be used
--// inside the function. Since the register won't be used this is kinda safe,
--// although not ideal.
--typedef int (*attach_probe_wrapper_signature)(int, enum bpf_probe_attach_type, const char*, const char*, uint64_t, int);
--
- void AttachedProbe::attach_kprobe(bool safe_mode)
- {
-   resolve_offset_kprobe(safe_mode);
--  int perf_event_fd = cast_signature<attach_probe_wrapper_signature>(
--      &bpf_attach_kprobe)(progfd_,
--                          attachtype(probe_.type),
--                          eventname().c_str(),
--                          probe_.attach_point.c_str(),
--                          offset_,
--                          0);
-+#ifdef LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE
-+  int perf_event_fd = bpf_attach_kprobe(progfd_,
-+                                        attachtype(probe_.type),
-+                                        eventname().c_str(),
-+                                        probe_.attach_point.c_str(),
-+                                        offset_,
-+                                        0);
-+#else
-+  int perf_event_fd = bpf_attach_kprobe(progfd_,
-+                                        attachtype(probe_.type),
-+                                        eventname().c_str(),
-+                                        probe_.attach_point.c_str(),
-+                                        offset_);
-+#endif
- 
-   if (perf_event_fd < 0) {
-     if (probe_.orig_name != probe_.name) {
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 3688b8487..84daeb2aa 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -102,6 +102,9 @@ if(HAVE_BFD_DISASM)
-     target_link_libraries(bpftrace_test ${LIBOPCODES_LIBRARIES})
-   endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
-+if(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+  target_compile_definitions(bpftrace_test PRIVATE LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+endif(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
- 
- target_link_libraries(bpftrace_test arch ast parser resources)
- 
diff --git a/srcpkgs/bpftrace/files/bpftrace-002-seven-args-bpf_attach_uprobe.patch b/srcpkgs/bpftrace/files/bpftrace-002-seven-args-bpf_attach_uprobe.patch
deleted file mode 100644
index 2cc55c86555..00000000000
--- a/srcpkgs/bpftrace/files/bpftrace-002-seven-args-bpf_attach_uprobe.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From c7dbab451484b96178da1a8c43330154ce4c9d7a Mon Sep 17 00:00:00 2001
-From: Daniel Xu <dxu@dxuuu.xyz>
-Date: Wed, 14 Oct 2020 17:09:46 -0700
-Subject: [PATCH] Detect 7 arg bpf_attach_uprobe() API
-
-The 7th arg allows us to specify the usdt semaphore location.
----
- cmake/FindLibBcc.cmake | 11 +++++++++++
- src/CMakeLists.txt     |  3 +++
- src/attached_probe.cpp | 42 ++++++++++++++++++++++++++++++++++--------
- src/main.cpp           |  6 ++++++
- tests/CMakeLists.txt   |  3 +++
- 5 files changed, 57 insertions(+), 8 deletions(-)
-
-diff --git a/cmake/FindLibBcc.cmake b/cmake/FindLibBcc.cmake
-index 4c09a8ca2..92cedab5e 100644
---- a/cmake/FindLibBcc.cmake
-+++ b/cmake/FindLibBcc.cmake
-@@ -7,6 +7,8 @@
- #  LIBBCC_DEFINITIONS - Compiler switches required for using libbcc
- #  LIBBCC_BPF_LIBRARY_STATIC - libbpf static library (for static compilation)
- #  LIBBCC_LOADER_LIBRARY_STATIC - libbcc helper static library (for static compilation)
-+#  LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE
-+#  LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE
- #
- # Note that the shared libbcc binary has libbpf and bcc_loader already compiled in but
- # the static doesn't. So when creating a static build those have to be included too.
-@@ -94,6 +96,15 @@ int main(void) {
-   return 0;
- }
- " LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+
-+CHECK_CXX_SOURCE_COMPILES("
-+#include <bcc/libbpf.h>
-+
-+int main(void) {
-+  bpf_attach_uprobe(0, BPF_PROBE_ENTRY, \"\", \"\", 0, 0, 0);
-+  return 0;
-+}
-+" LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
- SET(CMAKE_REQUIRED_LIBRARIES)
- SET(CMAKE_REQUIRED_INCLUDES)
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9162356e3..cef94d144 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -88,6 +88,9 @@ endif(HAVE_BFD_DISASM)
- if(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-   target_compile_definitions(bpftrace PRIVATE LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
- endif(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+if(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
-+  target_compile_definitions(bpftrace PRIVATE LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
-+endif(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
- 
- if (ALLOW_UNSAFE_PROBE)
-   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index 93fbfa876..a5d8bc56d 100644
---- a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -698,12 +698,23 @@ void AttachedProbe::attach_uprobe(bool safe_mode)
- {
-   resolve_offset_uprobe(safe_mode);
- 
--  int perf_event_fd = bpf_attach_uprobe(progfd_,
--                                        attachtype(probe_.type),
--                                        eventname().c_str(),
--                                        probe_.path.c_str(),
--                                        offset_,
--                                        probe_.pid);
-+  int perf_event_fd =
-+#ifdef LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE
-+      bpf_attach_uprobe(progfd_,
-+                        attachtype(probe_.type),
-+                        eventname().c_str(),
-+                        probe_.path.c_str(),
-+                        offset_,
-+                        probe_.pid,
-+                        0);
-+#else
-+      bpf_attach_uprobe(progfd_,
-+                        attachtype(probe_.type),
-+                        eventname().c_str(),
-+                        probe_.path.c_str(),
-+                        offset_,
-+                        probe_.pid);
-+#endif // LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE
- 
-   if (perf_event_fd < 0)
-     throw std::runtime_error("Error attaching probe: " + probe_.name);
-@@ -812,8 +823,23 @@ void AttachedProbe::attach_usdt(int pid)
- 
-   offset_ = resolve_offset(probe_.path, probe_.attach_point, probe_.loc);
- 
--  int perf_event_fd = bpf_attach_uprobe(progfd_, attachtype(probe_.type),
--      eventname().c_str(), probe_.path.c_str(), offset_, pid == 0 ? -1 : pid);
-+  int perf_event_fd =
-+#ifdef LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE
-+      bpf_attach_uprobe(progfd_,
-+                        attachtype(probe_.type),
-+                        eventname().c_str(),
-+                        probe_.path.c_str(),
-+                        offset_,
-+                        pid == 0 ? -1 : pid,
-+                        0);
-+#else
-+      bpf_attach_uprobe(progfd_,
-+                        attachtype(probe_.type),
-+                        eventname().c_str(),
-+                        probe_.path.c_str(),
-+                        offset_,
-+                        pid == 0 ? -1 : pid);
-+#endif // LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE
- 
-   if (perf_event_fd < 0)
-   {
-diff --git a/src/main.cpp b/src/main.cpp
-index 48fcf5aa0..09f4d9677 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -162,6 +162,12 @@ static int info()
-             << "yes" << std::endl;
- #else
-             << "no" << std::endl;
-+#endif
-+  std::cerr << "  bcc bpf_attach_uprobe refcount: "
-+#ifdef LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE
-+            << "yes" << std::endl;
-+#else
-+            << "no" << std::endl;
- #endif
-   std::cerr << "  libbpf: "
- #ifdef HAVE_LIBBPF
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index ace5ff106..332eba2b5 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -116,6 +116,9 @@ endif(HAVE_BFD_DISASM)
- if(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-   target_compile_definitions(bpftrace_test PRIVATE LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
- endif(LIBBCC_ATTACH_KPROBE_SIX_ARGS_SIGNATURE)
-+if(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
-+  target_compile_definitions(bpftrace_test PRIVATE LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
-+endif(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE)
- 
- target_link_libraries(bpftrace_test arch ast parser resources)
- 
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 44e6c174107..0d6a2a2c14b 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.11.2
+version=0.11.4
 revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
@@ -12,13 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=1f0fc30073547e3b285e1a373aa469bb18d3ba27f8c05f91016df0ca84f77f90
-
-post_extract() {
-	for i in ${FILESDIR}/bpftrace-*.patch; do
-		patch -sNp1 -i ${i}
-	done
-}
+checksum=5b9c7509887e4337841e3188eabcc7247bc2c1cc312c983cbb8b77e341d20242
 
 post_install() {
 	# clashes with bcc-tools

From 5595a646ed623852a8f184511dc29cd8596b6a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 18 Nov 2020 12:39:41 +0100
Subject: [PATCH 0023/3595] iscan-plugin-gt-s650: update to 1.0.0.3 (6.2.2.1)

The newer non-free bundle started with (probably) version 1.0.0.0 again
so we need to revert the previous version + revision to permit updates
to this version number.

This is untested as I have no Epson scanner available.
---
 srcpkgs/iscan-plugin-gt-s650/template | 45 ++++++++++++++++-----------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/iscan-plugin-gt-s650/template b/srcpkgs/iscan-plugin-gt-s650/template
index fc23354059e..cf7f59e1670 100644
--- a/srcpkgs/iscan-plugin-gt-s650/template
+++ b/srcpkgs/iscan-plugin-gt-s650/template
@@ -1,27 +1,34 @@
 # Template file for 'iscan-plugin-gt-s650'
 pkgname=iscan-plugin-gt-s650
-version=1.1.0
-revision=4
-repository=nonfree
-maintainer="Orphaned <orphan@voidlinux.org>"
+reverts="1.1.0_4"
+version=1.0.0.3
+revision=1
+archs="i686 x86_64"
+_bundle_version=6.6.2.1
 depends="sane-epkowa"
-license="AVASYS"
+short_desc="Epson scanner plugin for GT-S650, Perfection V19 and Perfection V39"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:AVASYS"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-short_desc="Epson scanner plugin for GT-S650, Epson Perfection V19 and Epson Perfection V39"
-_bundle_version=1.0.0
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	_arch=x64
-	checksum=d27e55652942f7c6e5f7f1b09296b742751c872e3963f8167e1f66fe360d9226
-else
-	_arch=x86
-	checksum=6f12a5d7b3c1a08a6c5f8762e1cff7ee89063eb73ec723f1822d3fa10c5b50f9
-fi
-wrksrc="iscan-gt-s650-bundle-${_bundle_version}.${_arch}.deb"
-distfiles="https://download2.ebz.epson.net/iscan/plugin/gt-s650/deb/${_arch}/iscan-gt-s650-bundle-${_bundle_version}.${_arch}.deb.tar.gz"
-archs="i686 x86_64"
+case "$XBPS_TARGET_MACHINE" in
+	x86_64)
+		_arch=x64
+		_cpu=x86_64
+		checksum=c28d4bb53aecda0eeadf3dac9a9eaef0e5616e7743de31f6ae394d1ab70ce982
+		;;
+	i686)
+		_arch=x86
+		_cpu=i686
+		checksum=c6d4a6c3bc454bddaf3b38caef30c18bd81b8c749bed0e2e96dc448d383627b8
+		;;
+esac
+distfiles="https://download2.ebz.epson.net/epsonscan2/common/deb/${_arch}/epsonscan2-bundle-${_bundle_version}.${_cpu}.deb.tar.gz"
+wrksrc="epsonscan2-bundle-${_bundle_version}.${_cpu}.deb"
+nopie=yes
+repository=nonfree
 
 do_install() {
 	ar x plugins/*.deb
-	tar -xvf data.tar.gz -C ${DESTDIR}
-	vlicense ${DESTDIR}/usr/share/doc/iscan-plugin-gt-s650/AVASYSPL.en.txt
+	bsdtar -xvf data.tar.xz -C ${DESTDIR}
+	vlicense ${DESTDIR}/usr/share/doc/epsonscan2-non-free-plugin-${version}-1/COPYING.EPSON
 }

From 539a04407ef975efd1f7a33dafee679f57f87977 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Nov 2020 13:48:26 +0100
Subject: [PATCH 0024/3595] plan9port: update to 20200927.

---
 srcpkgs/plan9port/patches/musl_getdents.patch | 22 -------------------
 srcpkgs/plan9port/template                    |  8 +++----
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/plan9port/patches/musl_getdents.patch

diff --git a/srcpkgs/plan9port/patches/musl_getdents.patch b/srcpkgs/plan9port/patches/musl_getdents.patch
deleted file mode 100644
index 381631d6c5a..00000000000
--- a/srcpkgs/plan9port/patches/musl_getdents.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git src/lib9/dirread.c src/lib9/dirread.c
-index 40fbe3c7..9e77eac8 100644
---- src/lib9/dirread.c
-+++ src/lib9/dirread.c
-@@ -10,6 +10,7 @@ extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*);
- static int
- mygetdents(int fd, struct dirent *buf, int n)
- {
-+#if defined(__GLIBC__)
- 	off_t off;
- 	int nn;
- 
-@@ -17,6 +18,9 @@ mygetdents(int fd, struct dirent *buf, int n)
- 	off = p9seek(fd, 0, 1);
- 	nn = getdirentries(fd, (void*)buf, n, &off);
- 	return nn;
-+#else
-+	return getdents(fd, (void*)buf, n);
-+#endif
- }
- #elif defined(__APPLE__) 
- static int
diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template
index 5b3e2789e95..99af118cbc9 100644
--- a/srcpkgs/plan9port/template
+++ b/srcpkgs/plan9port/template
@@ -1,8 +1,8 @@
 # Template file for 'plan9port'
 pkgname=plan9port
-version=20200222
-revision=3
-_githash=92aa0e13ad8cec37936998a66eb728bfca88d689
+version=20200927
+revision=1
+_githash=291f7411783bf6871b253f3b15ce691eea7a257e
 archs="i686* x86_64* ppc*"
 wrksrc="${pkgname}-${_githash}"
 hostmakedepends="perl which"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LPL-1.02"
 homepage="https://9fans.github.io/plan9port/"
 distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz"
-checksum=606840c59de9a3a6c447f381df21eeba57d3a6c9799af83877d43541a372497c
+checksum=4db90ed7859066d26a424ebde38b318bb6030ad9209cdbfb4f5fb32fb486a659
 nocross=yes
 
 if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then

From b6924b462650b5160ca9f1f3f1fa60a792181302 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Nov 2020 16:15:59 +0100
Subject: [PATCH 0025/3595] coccinelle: disabling safe-string is not needed.

---
 srcpkgs/coccinelle/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 85939a89d5c..310f9d43261 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
 version=1.0.8
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--without-pdflatex --enable-release
  --with-python=/usr/bin/python3"
@@ -13,8 +13,6 @@ license="GPL-2.0-only"
 homepage="http://coccinelle.lip6.fr/"
 distfiles="https://github.com/coccinelle/coccinelle/archive/${version}.tar.gz"
 checksum=9f994bf98bc88c333ac7a54a03d4fa1826122eec7016a1f22c6b2ef2a6a4347f
-
-export OCAMLPARAM="safe-string=0,_"
 disable_parallel_build=yes
 nocross=yes
 

From 7cec4b17fa939ddd82e8dc1a7503e22b229dc702 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Nov 2020 16:23:25 +0100
Subject: [PATCH 0026/3595] polygen: disabling safe-string is not needed.

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

diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index c66f6a37aa5..4c5d2dcf3e9 100644
--- a/srcpkgs/polygen/template
+++ b/srcpkgs/polygen/template
@@ -1,18 +1,17 @@
 # Template file for 'polygen'
 pkgname=polygen
 version=1.0.6.ds2
-revision=7
-build_style=gnu-makefile
+revision=8
 build_wrksrc="src"
+build_style=gnu-makefile
 hostmakedepends="ocaml unzip"
 short_desc="Generative grammar phrase generator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.polygen.org"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=60dbcec8aedcbb2545202ad97d41e592f232b8fc842ea25a7998c88a385148d5
 nocross=yes
-export OCAMLPARAM="safe-string=0,_"
 
 do_check() {
 	:
@@ -21,6 +20,5 @@ do_install() {
 	vbin polygen
 
 	cd ${wrksrc}
-	vlicense License
 	vcopy grm usr/share/${pkgname}
 }

From 8a46e903ef2c0615dd52c8d9a8ad7d48e076f677 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Nov 2020 16:39:49 +0100
Subject: [PATCH 0027/3595] xen: remove obsolete unsafe-string patch.

---
 srcpkgs/xen/patches/ocmal-unsafe-string.patch | 24 -------------------
 srcpkgs/xen/template                          |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 srcpkgs/xen/patches/ocmal-unsafe-string.patch

diff --git a/srcpkgs/xen/patches/ocmal-unsafe-string.patch b/srcpkgs/xen/patches/ocmal-unsafe-string.patch
deleted file mode 100644
index d5d89da21d6..00000000000
--- a/srcpkgs/xen/patches/ocmal-unsafe-string.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 18c163276f9b1f7f94e17a4f51f37a58b1ee4052 Mon Sep 17 00:00:00 2001
-From: John Thomson <git@johnthomson.fastmail.com.au>
-Date: Thu, 25 Jan 2018 17:06:56 +1000
-Subject: [PATCH] Fix ocaml 4.06.0 build, use unsafe strings
-
----
- tools/ocaml/common.make | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make
-index d5478f6..21ac33c 100644
---- tools/ocaml/common.make
-+++ tools/ocaml/common.make
-@@ -12,8 +12,8 @@ OCAMLFIND ?= ocamlfind
- CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
- 
- OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
--OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
--OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
-+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F -unsafe-string
-+OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F -unsafe-string
- 
- VERSION := 4.1
- 
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 928ccb505ca..5e6381480e3 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.0
-revision=3
+revision=4
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64

From 88a9c39481faf26dff079536c2e42771c952321a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 18 Nov 2020 11:02:51 -0500
Subject: [PATCH 0028/3595] python3-hypothesis: update to 5.41.3.

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

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 2615755e6dc..49e0c1ebe91 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.41.2
+version=5.41.3
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -12,10 +12,11 @@ short_desc="Python3 library for property based testing"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MPL-2.0"
 homepage="https://hypothesis.works/"
-changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
+changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=cec3496bb20a414e016421bf90e7bb5a06d025c45ea988da99d20144c587b282
+checksum=c41d6d5f35059c31996788822206a17c6ccfc34e5570cb9a4878f66767b76246
 
 do_check() {
-	PYTHONPATH="${PWD}/build/lib" python3 -m pytest tests/cover
+	# test_settings_alone seems to expect a warning or failure that doesn't appear
+	PYTHONPATH="${PWD}/build/lib" pytest3 -k 'not test_settings_alone' tests/cover
 }

From 3d5f19fce8967eceb91080a9d7e14b9f5bdc2117 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 18 Nov 2020 11:08:04 -0500
Subject: [PATCH 0029/3595] xpra: update to 4.0.5.

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

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 77eb3a4fbfa..ac7b4174345 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.0.4
-revision=2
+version=4.0.5
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-Cython"
 makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
@@ -14,9 +14,9 @@ short_desc="Persistent remote display server and client for X11 clients"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
-changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog"
+changelog="https://xpra.org/svn/Xpra/tags/v4.0.x/src/NEWS"
 distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz"
-checksum=62df0c54f8a6dd816e7a646b519104b828c4694fcddb105b8f89d6575dc35481
+checksum=df562b121f3c2be455f9795aea1430b45020a4b875ce638a7280ad8dbe31b486
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From dfe017dffb1406447592ec82590adf886d1a3750 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 18 Nov 2020 11:43:30 -0500
Subject: [PATCH 0030/3595] python3-lz4: update to 3.1.1.

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

diff --git a/srcpkgs/python3-lz4/template b/srcpkgs/python3-lz4/template
index f9c84a3af38..02ed0982e18 100644
--- a/srcpkgs/python3-lz4/template
+++ b/srcpkgs/python3-lz4/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-lz4'
 pkgname=python3-lz4
-version=3.1.0
+version=3.1.1
 revision=1
 wrksrc="lz4-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/python-lz4/python-lz4"
 changelog="https://github.com/python-lz4/python-lz4/releases"
 distfiles="${PYPI_SITE}/l/lz4/lz4-${version}.tar.gz"
-checksum=debe75513db3eb9e5cdcd82a329ff38374b6316ab65b848b571e0404746c1e05
+checksum=1ac354804cb2d5fb3d213857a6bf8590a301ef051cc16fbb4938bd2d6e524bda
 
 do_check() {
 	python3 -m pytest

From 80b610b87dffec344e4bea5091a7e1344a85c494 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 18 Nov 2020 12:24:10 -0600
Subject: [PATCH 0031/3595] zfsbootmenu: update to 1.7.1.

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

diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 8ef3a0651dc..890d217137d 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'zfsbootmenu'
 pkgname=zfsbootmenu
-version=1.7.0
+version=1.7.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=3feabc2b34a67322e5ec990141b3e28d58a5b70e2159ac17e9ec68b41fadfee9
+checksum=72361ed70d42537183aa0298384a062f127be115ea47c51b1da2d305a2f36c36
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)

From c0be6b23691bf191b38564f94b2076742d082c63 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 18 Nov 2020 14:01:22 -0500
Subject: [PATCH 0032/3595] polygen: fix vcopy failure

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

diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index 4c5d2dcf3e9..22811a9f7b9 100644
--- a/srcpkgs/polygen/template
+++ b/srcpkgs/polygen/template
@@ -20,5 +20,6 @@ do_install() {
 	vbin polygen
 
 	cd ${wrksrc}
+	vmkdir usr/share/
 	vcopy grm usr/share/${pkgname}
 }

From d98933d81d7e8407ae622b083c152b260703271b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 17 Nov 2020 21:54:48 +0100
Subject: [PATCH 0033/3595] gnome-sound-recorder: requires pulseaudio at
 runtime

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

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 99db640ad97..c79cf30f59f 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel
  libhandy1-devel"
 depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1
- libhandy1"
+ libhandy1 pulseaudio"
 short_desc="GNOME sound recorder application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 663e02c5b5fa9a3baa624f05d2eb6819f1fb8234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 18 Nov 2020 17:31:13 +0100
Subject: [PATCH 0034/3595] you-get: update to 0.4.1488.

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

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index 30ff19ad1cb..477db5a1ccf 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,6 +1,6 @@
 # Template file for 'you-get'
 pkgname=you-get
-version=0.4.1475
+version=0.4.1488
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://you-get.org/"
 distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=432c04170bb5f4881ca6af9c802b6c90e81759811487b8d7918762dcd674697f
+checksum=28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3
 
 post_install() {
 	vlicense LICENSE.txt

From 899d4a977befb6807b944cc49dd7df7ab252f90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 18 Nov 2020 17:27:30 +0100
Subject: [PATCH 0035/3595] croc: update to 8.6.6.

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

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

From d6190d9948c2e6b455ac65e15134d09d663faab3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 13:41:49 +0200
Subject: [PATCH 0036/3595] konqueror: update to 20.08.3.

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

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index 473e020ec58..bde5fe25037 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/org.kde.konqueror"
 distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz"
-checksum=e3aac062d9e431e63a861ecf5a1d577b11a154faaed5bd95ef6b69b4fc8a34e9
+checksum=f37c6c0f39870dac2a1afe2eaeccfb026676be08ed97ce4f44982d26079252eb
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;

From dff1b289f57f1b9ae205fa2abbc855cf790b3c8e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 13:17:06 +0200
Subject: [PATCH 0037/3595] knotes: update to 20.08.3.

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

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index f4a8c2cdb12..0f5204751d2 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.knotes"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7d066a34d46684f258481466875d18f99a9000d66dec36f7dcab92790f6c57bb
+checksum=487c1cf7172164eafcfe17192ac8dcb8b2bf02cd78934d1e8dd21a2db4445c7b

From d820ebcf44bf6a48bccfcaf7b08574db49416ae6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 15:29:42 -0600
Subject: [PATCH 0038/3595] akregator: update to 20.08.3

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

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 144a30ee6ff..eabb8bfae2b 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,9 +1,9 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
-configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
+configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
  kconfig kcoreaddons kcmutils gettext"
 makedepends="knotifyconfig-devel kontactinterface-devel ktexteditor-devel
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=21751a5a14b188649caeeb19cbcef877dd00548a29c073f8694e227d951c7a00
+checksum=c5f242d4ae8e67068df04f1b3d758b26249827c826e4f369cac3afa2814010bf

From 5ff3245f3e9874a03d9a5aadf87f78fb7e9424c6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 17 Nov 2020 20:05:49 +0100
Subject: [PATCH 0039/3595] lz4: update to 1.9.3

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

diff --git a/srcpkgs/lz4/template b/srcpkgs/lz4/template
index a03a5f65a0c..78d8e465b3d 100644
--- a/srcpkgs/lz4/template
+++ b/srcpkgs/lz4/template
@@ -1,7 +1,7 @@
 # Template file for 'lz4'
 pkgname=lz4
 reverts="131_1 130_1 129_1 128_1 127_1 126_1 125_1 124_1 123_1 122_1"
-version=1.9.2
+version=1.9.3
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -11,9 +11,9 @@ short_desc="LZ4 compression utilities"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://lz4.github.io/lz4"
-changelog="https://raw.githubusercontent.com/lz4/lz4/master/NEWS"
+changelog="https://raw.githubusercontent.com/lz4/lz4/dev/NEWS"
 distfiles="https://github.com/lz4/lz4/archive/v${version}.tar.gz"
-checksum=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc
+checksum=030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1
 
 post_install() {
 	vlicense lib/LICENSE

From d8cf26009560c3c5810ab77382b7a37d75485691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 18 Nov 2020 21:10:50 +0100
Subject: [PATCH 0040/3595] iscan-plugin-gt-s650: revbump; wasn't picked up

---
 srcpkgs/iscan-plugin-gt-s650/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iscan-plugin-gt-s650/template b/srcpkgs/iscan-plugin-gt-s650/template
index cf7f59e1670..efd0ce6c046 100644
--- a/srcpkgs/iscan-plugin-gt-s650/template
+++ b/srcpkgs/iscan-plugin-gt-s650/template
@@ -2,7 +2,7 @@
 pkgname=iscan-plugin-gt-s650
 reverts="1.1.0_4"
 version=1.0.0.3
-revision=1
+revision=2
 archs="i686 x86_64"
 _bundle_version=6.6.2.1
 depends="sane-epkowa"

From cc9aab1f3fafcec85a877b6dad031bc8042be7e0 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 17 Nov 2020 23:17:11 +0100
Subject: [PATCH 0041/3595] cbindgen: update to 0.15.0.

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

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 76d90d4cf6d..df6c84f43c4 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.14.6
+version=0.15.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,4 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=9d48756cc28acf33675f66d7be6a95b8c93d63255bb6f75909828e6b0cab1945
+checksum=9e2756a292a3b1182b8f741d6bb9e5a8b8a8dc2eacfb187c7db649966452798d

From 73d2f5ea409ccca7dd7c46d896b0cbc7ca21182a Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 17 Nov 2020 23:15:38 +0100
Subject: [PATCH 0042/3595] nodejs-lts-10: update to 10.23.0.

---
 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 1da2b118c97..7ec04528233 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.22.0
+version=10.23.0
 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=e07575455cbb6670e3f30d2f846d3078ef2c181255ff0932089182529443e1db
+checksum=fd356039d5c223f020db514b64e4619b285e669f8f5f0b6232458d4440c6741f
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From d3007c6619346956bfb3794b1fd281965b94ad74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 18 Nov 2020 21:45:36 +0100
Subject: [PATCH 0043/3595] firefox-esr: update to 78.5.0

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

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 5bc193b1496..eb66fe17cc8 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.4.1
+version=78.5.0
 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=1978eedd975b1cf95bd4a04b2381560d1ad9a4223032717f23fac26e3458a760
+checksum=51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
 lib32disabled=yes
 conflicts="firefox>=0"
 

From dffa3169ebde1a45f2f77b2961d7daad7592802f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 18 Nov 2020 21:52:59 +0100
Subject: [PATCH 0044/3595] firefox-esr-i18n: update to 78.5.0

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 354227be9e9..9c9f9828cdb 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.4.1
+version=78.5.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="429485077b26a17d329ba98d49b57d33f7f6c9a19779b2b917108650f7ff1e54
- c8e4c4bdf3544d34aa2110464e8573c5c7edcf5276439824afc3bc8b59f4ce5d
- ad2903fa9b316a608137fa0bf59f141f785e3f4202cbbf444af4a0d7db88a12b
- ad2f4d99fb575d0df60a9eb278f5441bda30aae2d63a0fa74c739325ede3e709
- dc7af62505574f9629a9dd2075313fc2773e0230a221a8fc9ca7d1d14ad11def
- 34ffadd81f8a02cf3d69e3403dc5b1dc56fced869ef87abab52e514c2c38dd5f
- 7e720fd39b01d2b3707399b61b8e1d40a839b2530a53af0afab2372f70f49091
- a160ff5057a2f4f6e9d354dd3ccd0e002586d426c09f41c5f25d26c5d4dbc6c8
- c243d1ea5d1429af7e8a11ee078782ae7533fe45279112f228e0638ea9d83ddb
- 2a2e3ee4b5efedc8c2ab49d3ad173e0f3fd1b05d3ed0cba33ea0635a25a09f80
- 6d136fe53098a1b7066667303a1233470838125449b4dab62d414322cff9f6be
- 09ff559dc3a094397ae5cf468a540009c8b7a2949e6f618aaa994258c2cf9480
- c237bba84c0c3e2c11f7715f7a7c9510ec4f84291cff70dcce7c2d9842eb5e6c
- b28328ad9983d24fcab35aa78c2b095694811c86a5306ec6b1224ba4b0aa873d
- 9ea99fe41631f924e01d43696c13d3521352087ba748a90924ae07f34fd53cd4
- d29de73b318f20bf1f98791953ff14737de43caf6d108ddaaf537050257a841b
- b86a629e77635b2d07f731fb3a5b981e1fe3363a2cabfc311a03989556f183f1
- 40e9b45fcfe2e42adf14a401c82c596f7948229110c9601970d76e7e87158799
- 18ba032eda283e0c78f83edbe580281e438eb0ee3bdabfd1968ba2022ee511f5
- 9266caa02c32e60d668f960486a0d238ac00cc73fa2ee8499b6eb41eeef1e538
- 431cc346b49feb1c0d890817881f3b332f8a28a47d32f3eb47dbf71168bf6339
- 28094ad5667580bbce889b2f8285aae1a9bfd5a1a77a48e9d73c2738af2b9849
- 2400293f46918e5d337d3a30eca19722a4b235bd6fcf3543c0c5f7491c905883
- 454c4f5745c2def48115543174e94df6b1cb9d23810b0b7abf06bd2c30ec2adf
- bb30fd1f438b0a7421b9fb9078270873a8ab9123ddd84096f4d428bbc3b8c241
- 784c9565dc42d5b8e96a10404ce5acad6bf14e860e65ba49b30c42a6b0955cfd
- 0364963a1ccdfbf7b55fdec5b79fc5475b4988198c1929a8d50da4aefc48d4a2
- d52dc6ed1faf50fd3577c608d87e9b91542c600142d218f8de4d2b5ded4818d6
- a115eda10be77100817e297ee0211ab7271ce0111a1bd8327e31d4e895ab864d
- 3464e3bf67d42daa339b5a3ebe7a75213bbd3988f8ba48bd2c1763c2f359abaa
- f49980a234cd4be476668735b40d3f467288b8178ccbef62e687884efe3bf133
- ad7b0d033f0df9615661b310ee3438728a0576290e49b3635d536c845135002d
- ce539affb4a31b622ec2fa8d60b8b3c23427534c887d5416b9cf01ad9ac05aed
- bb48ff072cb65fda33980d9876d729e92cfb2dea3aa9890605556a49eef3a29f
- f88c2ae9255c1623d97d5ef4f78af7149bafa54354e00cd5200b2e0627eee481
- d3d4b3da98bd51d598c789d3de7ac9bd91f7aa79b9ea6eff570cdbf6ed61a62d
- a73ccb26db0db792f49eaa7284b3b0f87b86ba661c6be6c1c26de78027a32ca8
- 0e816a76bcfffb323acf84d300255ada333d2ca8dd1c2944c9cea96ae0728b68
- 90cb6d3c481893499848b71a06148c5222a6ceda13d0c992ad8d68638d6d6ea9
- 24af0db942656b718ca13547ecf34d191ff791dde60c0a914f3c02c5f84be5c7
- 0fe7768da3b2cf03fb1c3afa5779c1413e379f1ce6c112b21afe1035131e4599
- 4096af441c745cf7fd6649ab4a5c3d9d518565d317897f324878031b7f8a81be
- 35835edbe21bcabe30e686ea80962e3a53b62af7cf71644472bd43b2c1ee36d9
- f0877b9d0791b87b75dbaad19b92df407696b68fb37899c1f3deedb915bb95f8
- 0c160d47b5bcd8ae4a64a03d211c16ee578b64e06782c9869680b86846d540e6
- feb8d5346564f53a2ad43d4244a623db6e1b0e045a56ef93924810cdd3bbaea1
- dcdc9216ca95aeff9097e39739c78d64c93f198380e63b5fa1d1d17bc9b4e86c
- 5b0780b2ca45ac864023cc9dea88e735ebd115cd8012dccc6d53531a4cb42ad7
- 84cdfb570a4643c421b31548a941e24d068197485c3ab51897d0e4769d409d9e
- 6128d5cc4de18349ed5866ca474c683d2bfd9b67b9f67dd531e088f618d30bde
- 0293dff5bb082fa8e8f91e99bc9760cade570cbc1c2625a82abf17d986d859b7
- 686834a3686aa494f6ddec93b109ced9ea7214cae3e308aaf13cd7a01c3d8917
- d0cb07543c41bcb012fc0ded11d122fa87441ae33f84f23b54cec8ac03a9fae9
- 015f8c372b33a2c14bd2dc83ef8fe7e365d4df71c47ae5470b15217455b907bc
- 544e25712787e0c633795699670ad0fae6fb97202c8dab76569a01b237c60c80
- 7d78d7853e6d8bebd28c8b9b571126a6c8faa3df8b5afcdc0061d4ad644b1bd8
- 2a7fc27da3c0c496b6bffed3017f69dca1958e52bef180e19f668b0932ae0342
- 5cee23c23d873a1381a62e3bd94ae946adcedf704f1f970817f22731b11998a9
- 7d9f313ef2d74daa0a7c6192ca330e95148f51fc800a5e157cf6778e71fd75f4
- 4303cd9a581f2f527c74496d7d4624e6bb483d1dc8b5dc2bcf0917a748afd827
- 72b7755dff1918755ef2d65b515932b4a927d4a94bb0ffa761bc3d3273d54f05
- bd4141cf83d77fa87870801443049a0746000c963757c6f5a509eb31b83edc81
- af32a08abb51d5f36c93180d3fe2fa0586f6f5a0e78e75f401ea4dc4f0a42187
- 0b3c84bcf3f946ebb1729a80d4392598a8cb511492e96b4a947068c4f0c77832
- f61eb4c29725ef134f44d9d704c690526c2e78674df09865d4cad83b7b6980db
- 4b90e25b529f67ff1eeeb8e52fa6457d967a829909971e83c4720c1b2f4530c8
- e3347724ad61500b137a5361ebafd99df1618b19c3b8f33f64f727d6608bce16
- 5525a3df8ad98464509fe73932cfc14d4580760a1b3bb3203a91d4d47daf29e4
- 0c9eea71e1a531f3ca6cac43597be01904cc1b02404c23af37ec677408e5eff5
- 450e548d074236882a9a916c533fb7294d02efcac667b4b19c93f19ea94ea17a
- 78d17297226140b56868c37ac68f89e83df965e704ac7ef39a2e65fcfa47f907
- 6593336a08b0d2fff5e1322c63f9ebc93429f4c3a15c8e5a51a52a8fc8ad1171
- 95c5ed5beb7c9ec4c2c5cb26e364fadafc46bdd9d586c555e8e83453bd1b77d6
- 1682671156449959b9ba2b6f87203c5b9ea9be0909eb1357146c8cb8dde443bb
- a8602b62288a42d69db68359b851b5f8f9cf200cbdb6f817fd8727015a397f0e
- 08f3d342ae17ecb6f7536b6bbc9acda138ce640f3c58a0b4b8349c7f4b7dcc6a
- 76b3e3b86bbb7728e743376ff70b3e087b5adefd6f67282c8c60973e4711be8d
- b33083a788e0fc4d3cea81fa3d3ab36c375382c28f1b25ec87ecf7c8a607e831
- 7b10e57b07be573113a8c7c23b6013ddd39d8c82b18b4b9baec87a3dfb515c46
- b1c267f4d76d5b47aa271fe53f10f33f9d60af957fbefb835708fc5dd45f65d0
- 0e4a06de262f56628f6901641c6f7241f5de50e3c2d59d1b78e8249dcb5d3bb6
- 14c1bc412561148e117ccf82c62a6d605d87c71d846abc57bd97f5723d098bd9
- 4b1a28eca5737ac87e56e46ae31f3d904b2035cf1c791780e55f82fd46c7b69e
- fb1932d6fdb11b3340473222c29aff24d92d8ad9f28703bcd708ffdd6bdd0e9b
- 9dbbd128131b573f59646abec151d0629e723e2ee2ebff49f88910dfda0c9142
- adcc9f8b6aad9ac8a783e728caa1d3fceef9535c1d0033902642747f37e32ccc
- 299f36fea9571d0c4f9baaee4b0e46d4beaab354898eeb6fb86c12abd2410c88
- c9c3ad702053b6c1466354c4d790007e665a29ea83de2eae313a7e5ba87016e6
- cd18d2a6862376761f3f866cb18cd2fb78c260438793a6ee584c78a366f83c17
- 0e7ee088dc166742a9d518d584f8139eb36f52ad59782fdd6e81f0b769cc0c01
- 4ac99dc69cccb0fa1713ab2a4f587410e9b6876458f849ac38ea52907d9e7b86
- 1879979fa08af943cee195f9fef7460cfd79ba15c10fe44fc1761e3def63c1a4
- 656cd0707e67b8c0238570dfb41d7a8232f6c6c328a7c8d2594d0b8f0a30e4cb"
+checksum="3e765784fc8084ead4c87076c4434b4f3fd2228aa20400e90b65b0f5c72fc16a
+ 722beb61c7e4b33a1888c9fc04faad817a2733e7943d5877250820dc4aa6b133
+ e0e39929f8a074124ae0bcafb1bbe591eef81867e9cdfd50b252063ee6285753
+ c4c893e8149df07d309b8d4e688824379136b0927388775114d5ec7f0d2881f2
+ cd53cc4e139c8daa401de1056a17378bdc595a48ec64038a8bdf55a8e38806d9
+ 37e32148b5a2cf11550e210014f82c293775820757eefc31cf8d7ca8c322eb5f
+ 3b8bdf0436da0a9b5f8fa494daee140481af9d00c97698d88b6f7233553e0d86
+ 1cc1529d7b5544d5915891411964b85edaa0d01a5fef8fd76a1aacc2dab64886
+ bc0ef34d66bea69ffb19aaedf56bdbc3aa6d138e7edd417d2113c8bb2c1ba7df
+ adf30ffbd7f3d6f8e4eac8de7a6ab70c00d13af7485c9f98097e6bef4f49bde7
+ 3dbff0fc4c9ceb838a219a237954fddf8af088c02a36c5098996d15c8069fef1
+ eef339b091f610072c7f1e597628ab619b4c6981d215b3d7337869f369bbd622
+ 051b95edf7bfc82a308de5158ab15f2e8a318d46249ef1c46da8f250dc7e20be
+ 115cf94154f517c05550726f5aae7b7d7dbf65b5a7b946e555bf82c6044e71e3
+ b0c0fe7bab8e1d253ca0d83542a54a643ac12bce515529c4eb3b0a714a2610e2
+ 1886dd3ed337db1cd8593847dca08f95ddb115aa030245c587609e2959def202
+ 8bcb2ca27adb0b78c3720ec7d65bfb487250e7f740463c890fc2f6d7d64d3925
+ 277128757f24bd2b2e6415fb1adb4309e32a984560f0ece8cb25d993c32fff38
+ 8f5203b606d121cf4009ed542123e34fe00ac562a930883c8f45e207e97a6498
+ 9c85ed6662c88a90623847ab8abf817643a6dc73f789d3ef65b8615136f7e467
+ fb838d0c87caaf73aff71b25bb42342aa569d687b4ff564dd112cbd3b29b6570
+ ff61e11eb0910790b3fd2f8bfd2dcee1ba1390ed23ab0140394fa82e24ea264f
+ 49f46ce71560c91aba249ffe1915dc0be22ed8f0f1e0e2f1bc7c774df899a04d
+ 248438b0d96bfa03678a930c94a2395accaa95e253a5f301a4c0135f7419abf3
+ 5300e0a08a7d5fb37f6ee6bfaa9620c302c8fc1a9e095e776ed0f3ea9de6f5f1
+ 87f7315f1d12c5a2789923efeb6297e431a924ab06a85aac1a322ccd4b861a3e
+ 39822068262b3d66083f26f798f7a97210867957c701221ae095a7572a3fb58e
+ 2856a7f9d1e7f547d8a5f0a0899097f1ec565a29b4dc2e5e1b5581d6cb3652d3
+ e4e15837b0aead656ce12de49f28abe7bc9dc5ff450473ff2e7df1e11f3a8af2
+ 8e8ac6aafcc5306713bb98ab565418d3b8d29234948f9c93daf322e23d76f536
+ 74eda8fa22aeebcec1c7af14e9f28b3a32c1a57c4d5c39369f673fa55ba6b541
+ 8cc27f53ad5f81eb22b458f5be79a33f13e92a4a4f6c28eb2f3ea680a154cc3c
+ 3543017e018844eea2abfef36d6f810883a9dcb69f46b97f77596adfd2bdb71d
+ 434d2067c6d0e0bf901d1a8c21c0ea47a5086b280a7577a84fd77e8869a5f580
+ 0e35f8c922f715b9931bfc3e408cea286bfdb31dbd87da77849b981ba9b77abe
+ ed24f1b9c79416d5d9a419816c1cb1bfa2851d9c5a73d7f84f9b04cb25625f85
+ 882e14a22aad277243dbe532c86a92d9769018317875c2225be3a300f912e0a1
+ 2bebf7c4e67c424a81608d1b04b4a3c3511bb7e386a2fafc1bcfcf2d462ed61c
+ f4fcf28b5b590a76330c8613ace283fc4402a0eb490d5c15696eeb28685fd527
+ f2294b255cb450291189b29b9dfa01a51d222dfe01b577f2c9e6778cbf8c3168
+ 952d4527344eddb7fcc14d0be994d7a1bfa4e6601423671ef2b5d6d0725ba4fa
+ 2a20f17ba270ca3b353ad482b25dfb0b2401ee4e559d6cb33e64834a25b8ac43
+ cfdb355364da75f1189c0cbfd1be83841a0f9152c9f9e4c862c80c78d2926fcc
+ ea2a93e791e1d557a56e01ae4ce79b013d956525f2f765e9aed71c6bd565e1aa
+ cab203c3fd5451dc1814d9302d877838a1a6dfcd00c80d1241bd283cd4b361d5
+ 5fae24cce7839b92244fcbacabb8d661aa1ecc331ca28f728dcd6a77b38ef03c
+ 0fff8b552d0e3525dda21df472402df4b052dae0034923462699818b20cec21b
+ ff67f20810497666bd2c95653392e28c18ff3d02a03a6c8c8bf7314c8a2939b1
+ 5cbc945199534f383b41f4ea628f653e6b59ac0924f1b3c11eba0604b0f85fba
+ df8ef9970b15a71967a926eab22f4d9df390cc70ea9201a77125fcead4e1f883
+ d1a6555a9e014684ce7cc802e93a6a790676ce3eb9faf08d99bc6778fd2a8167
+ 819667512b60772224546348ef23440f1dc09e7f536e91a3f88fd196128fb1bf
+ 0708cf76da24ac029f007638014952e096b04ca471632097353fbc14a4e54fc1
+ f08dbb11731ca38a04bc6287c330e0ccbd07544370cffc581f166910d2f7685e
+ f6e36467ca2fcfc4fda188742feba2183b59cde6b3e1a942d25350278187feb2
+ f4926b13c72fe39c152cd7ccb4fea43cfe5f5f69cf3cc018bbfc11454d8d866d
+ 2191627482202620035902e5a6cd299e9c83a24998988fe37a3a20025a96f060
+ 9b6cdf917533dd30cd9ce4e5ba689be7b96a948b1c22c4a12298f26ed2c8591d
+ 65d90959a8d8f5c29655a8f237036b46e10707f994c202f8d84b9bd1e74fd305
+ bdd67486c528f3287a98f99f437fe2bd3fbb6910430e8f9c7c4350797cbccd28
+ 236ed00a117afa627df251450e79bd5f69b8c02775c8db4815252a6989da5d18
+ bb46a0e25a7a16528133f1f96a8f6487c5d6c30ea7b1c8bcf01b46c9211bfcca
+ 0a3006e1d07b86c59dbbd1ff7347c8bde2a3553ee85decb938fbd115d9d39918
+ 6e6c1526ef977d792b88f0b498e8b54a9366fbeae9ee630c0de7d17998e37d9a
+ 6f497ba5654ac179de620f03b2443a7dd19e49e552c2d0086582d45dc3749038
+ 49fad0cd125b69d8b033529c886f87757cc40ed2b4a738247676677363789ae5
+ b0097fb4a64f506274eadf17ee88086a80173fad5baddc30ddaf00f4beafa62a
+ 23885552239b77bb7c629efebfe30ef7e7f928994ed9e2defcb6ed0926a2ce1e
+ 5a380cf5a606718fb00c93d3d2e344d09e2d38932ade99ffbe2ab3284ffd687c
+ 59f5c3d2098a7ab662cc2ae710b8c8fae11a8ba42b270c61231ab7a1f3cbbec0
+ 062bc8985f60218a81f6cb4a46f7d883eb03e0f56936bb058d9865b5c872fb9e
+ 76e63a1e4698caddbbe1676242bca61cf1f5a6a6087b702ffa4136e63ed545f5
+ 0d94fb4da63fd669cd41410c20f9457e005299666ecebfc0a59356b877d19e89
+ cc24b2ec45bdbccf7dfe619361bbe19bc8dbbce402eb61ea2ed34c3dcaaeb92b
+ 4f5ac0ee579c829c1c03a8f1030f90d7df39a18bae39154ec111c4bbf2d2eb35
+ 2461bc391c5761510c5b03c69c65f65141fbe7ae8adef34316b709bdf1695943
+ 86fb2c376b6e5e0190aadb847506c7990590ec84ecf96f8a56e32bc8d3998da6
+ 924557434419734c8c19405dd5145d5631c8c4ae773f80824feeef1df090e9ae
+ 21838e1b599b8ada23b1a98658e1e4d7b9e0ecefb541688cb5f2f832493c1d7a
+ d550b629fbd366cae4ab0db38da1c799a399185b20f1f020d6328b95432d8da2
+ 024ba50bcd7f90fc1ec700592dc91878165ad99be529f905e134e5449401fdd8
+ 0cb8989266cbd7c8e32d8f1cde6d6c7135b4db3ba3fcff13d4ecf7951d5edfd3
+ 73b2d6acf4d0835d53c565e3ffc63302d64706e2b9382b87c83723f4732d1034
+ 163fb77483c7566a7a1696246fc526417c875c4d45d88a962b320694f1edbeda
+ dd725ded1fefce54d356a32999929f273eca6905aa195d24b8dcb59202557b4f
+ e9d2d447bec561f240d10f3ffdfbdc26e40568a8c78843e8ce4d2894ced2c427
+ 7a2acef6b2eca04c6d0749b6fa649214616a448eb1577b5105a4e53f9d1510ae
+ db6a7dcc302ac685087b4a89e85b7608fbf994cc01aac6d09be0617dd4c0d263
+ 116081cf65d071e0182febabeab94dbfbf42d116a6914e6903c58376593af9f0
+ aede783487a9786425ade0c8d4eaa4fcf6ef2aa149a49d96b2212639296a6e4e
+ c3bee746ab045d315e7cae158d920e69e5163bf6ef6569172444a1cb767bff90
+ a6b4e99f21bb4bebd4566ac45b3addb0593b370e959fc643d0f9d9628183a621
+ c0c6dd2ee7901a69f575f003cf6daa9781bc1c3f7081cf63b07d5121e46f2849"

From 7e7999990274dd4a67266d32801fffcad8ca2047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Nov 2020 11:21:42 +0100
Subject: [PATCH 0045/3595] gcc: remove wrong include-fixed/bits/statx.h header

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

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 667818d2c1a..94e303d58ff 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=7
+revision=8
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -366,6 +366,10 @@ do_install() {
 		rm -f ${DESTDIR}/usr/lib64
 	fi
 
+	# Remove "fixed" header
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085
+	rm -vf ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/include-fixed/bits/statx.h
+
 	# Remove libffi stuff.
 	rm -f ${DESTDIR}/usr/lib/libffi*
 	rm -f ${DESTDIR}/usr/share/man/man3/ffi*

From 52a43d537db5ef3040c129da2f4d6d0f3504c214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 18 Nov 2020 22:59:32 +0100
Subject: [PATCH 0046/3595] icecat: update to 78.5.0

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

diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index b802c375288..a416d3da022 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,6 +1,6 @@
 # Template file for 'icecat'
 pkgname=icecat
-version=78.4.1
+version=78.5.0
 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=bf6a624480fe6b7caef7cecd4ece3aa3da352fbb49461ed7a110010d356a68d2
+checksum=51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
 lib32disabled=yes
 #nocross="warning: src/compiler/glsl/glcpp/glcpp-lex.l:622:1: fatal error: opening dependency file .deps/forc e-cargo-library-build.pp: No such file or directory"
 
@@ -31,10 +31,6 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="xptcall bitrot" ;;
 esac
 
-if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
-	broken="rendering is busted, dunno why"
-fi
-
 CXXFLAGS="-Wno-class-memaccess -Wno-unused-function"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 3a7b922d163e5bd3d8c16124ec09a7c298f2c7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 18 Nov 2020 21:49:28 -0300
Subject: [PATCH 0047/3595] raptor: backport patches.

Fix CVE-2017-18926 and a newly reported oob access.
---
 srcpkgs/raptor/patches/CVE-2017-18926.patch | 40 +++++++++++++++++++++
 srcpkgs/raptor/patches/out-of-bounds.patch  | 16 +++++++++
 srcpkgs/raptor/template                     |  2 +-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/raptor/patches/CVE-2017-18926.patch
 create mode 100644 srcpkgs/raptor/patches/out-of-bounds.patch

diff --git a/srcpkgs/raptor/patches/CVE-2017-18926.patch b/srcpkgs/raptor/patches/CVE-2017-18926.patch
new file mode 100644
index 00000000000..64b051418b7
--- /dev/null
+++ b/srcpkgs/raptor/patches/CVE-2017-18926.patch
@@ -0,0 +1,40 @@
+From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
+From: Dave Beckett <dave@dajobe.org>
+Date: Sun, 16 Apr 2017 23:15:12 +0100
+Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
+
+(raptor_xml_writer_start_element_common): Calculate max including for
+each attribute a potential name and value.
+
+Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
+and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
+---
+ src/raptor_xml_writer.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 693b9468..0d3a36a5 100644
+--- src/raptor_xml_writer.c
++++ src/raptor_xml_writer.c
+@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+   size_t nspace_declarations_count = 0;  
+   unsigned int i;
+ 
+-  /* max is 1 per element and 1 for each attribute + size of declared */
+   if(nstack) {
+-    int nspace_max_count = element->attribute_count+1;
++    int nspace_max_count = element->attribute_count * 2; /* attr and value */
++    if(element->name->nspace)
++      nspace_max_count++;
+     if(element->declared_nspaces)
+       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
+     if(element->xml_language)
+@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+         }
+       }
+ 
+-      /* Add the attribute + value */
++      /* Add the attribute's value */
+       nspace_declarations[nspace_declarations_count].declaration=
+         raptor_qname_format_as_xml(element->attributes[i],
+                                    &nspace_declarations[nspace_declarations_count].length);
diff --git a/srcpkgs/raptor/patches/out-of-bounds.patch b/srcpkgs/raptor/patches/out-of-bounds.patch
new file mode 100644
index 00000000000..08b1b0d37be
--- /dev/null
+++ b/srcpkgs/raptor/patches/out-of-bounds.patch
@@ -0,0 +1,16 @@
+Patch from https://bugs.librdf.org/mantis/view.php?id=650
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 56993dc3..163f34d5 100644
+--- src/raptor_xml_writer.c
++++ src/raptor_xml_writer.c
+@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+ 
+   if(nstack && element->attributes) {
+     for(i = 0; i < element->attribute_count; i++) {
++      if (nspace_declarations_count > element->attribute_count)
++        goto error;
++
+       /* qname */
+       if(element->attributes[i]->nspace) {
+         /* Check if we need a namespace declaration attribute */
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 477df6a9a0e..5408f6b745f 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -1,7 +1,7 @@
 # Template file for 'raptor'
 pkgname=raptor
 version=2.0.15
-revision=2
+revision=3
 wrksrc="raptor2-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --with-yajl=no"

From 8286e04ac730afdcee40665c1ae2f5d9108f68af Mon Sep 17 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, 19 Nov 2020 08:44:25 +0700
Subject: [PATCH 0048/3595] matio: fix musl build

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

diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 63d059701b6..d22e883530b 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -17,6 +17,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_va_copy=C99"
 fi
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
 post_install() {
 	vlicense COPYING
 }

From 2f49e74681397a781ba9411f2a04412d9d24708b Mon Sep 17 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, 19 Nov 2020 08:56:00 +0700
Subject: [PATCH 0049/3595] icecat: broken checksum

I don't know which checksum is correct, let's mark broken now and ask
@pullmoll instead.
---
 srcpkgs/icecat/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index a416d3da022..d68904d5089 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -18,7 +18,11 @@ 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=51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
+checksum=377feaa13de7ca4c930d69a0c0109f0a38d4fb7fed71b6db42cb1c798cdd95ed
+
+broken="checksum reported by pullmoll
+	51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
+	I don't know which one is correct?"
 lib32disabled=yes
 #nocross="warning: src/compiler/glsl/glcpp/glcpp-lex.l:622:1: fatal error: opening dependency file .deps/forc e-cargo-library-build.pp: No such file or directory"
 

From 0128b405149132a83c73d89edd4a81977c6548b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 18 Nov 2020 23:12:44 -0300
Subject: [PATCH 0050/3595] elfutils: clean up elfutils-devel depends.

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

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 99159a2be41..9039ee1bada 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,12 +1,13 @@
 # Template file for 'elfutils'
 pkgname=elfutils
 version=0.182
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"
-makedepends="bzip2-devel liblzma-devel zlib-devel
- libcurl-devel libarchive-devel sqlite-devel libmicrohttpd-devel"
+_devel_depends="bzip2-devel liblzma-devel zlib-devel"
+makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
+ libmicrohttpd-devel"
 short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
@@ -60,7 +61,7 @@ libelf_package() {
 
 elfutils-devel_package() {
 	depends="libelf>=${version}_${revision} libdebuginfod>=${version}_${revision}
-	 ${makedepends}"
+	 ${_devel_depends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 823d72bb6e64540e046f8ef82d630b445ed15473 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Wed, 18 Nov 2020 07:51:28 +0600
Subject: [PATCH 0051/3595] Komikku: update to 0.22.1.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 8420164111f..c2be0f5173f 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.21.1
-revision=2
+version=0.22.1
+revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -15,4 +15,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=eacbb0bc7f1436def568810da52f29afc9ec26c1354b184a848e59343deffbbd
+checksum=c09726b0bf7f51412e98b193389d8de9554ec807916c99c170cda3b9e362fc6c

From 1bda714b8d842ea175cd3fd52601c7bb5ce079ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 27 Oct 2020 16:28:45 -0300
Subject: [PATCH 0052/3595] fmt: update to 7.1.2.

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

diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index dc52932929e..23e10d0b615 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.0.3
+version=7.1.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b4b51bc16288e2281cddc59c28f0b4f84fed58d016fb038273a09f05f8473297
+checksum=4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c
 
 post_install() {
 	vlicense LICENSE.rst LICENSE

From fd8ad127c393f1d3b81f84aad6f242c4288b7ca1 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Nov 2020 11:08:28 +0100
Subject: [PATCH 0053/3595] wabt: update to 1.0.20.

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

diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template
index 241f5b7bcfe..752dfd31e6b 100644
--- a/srcpkgs/wabt/template
+++ b/srcpkgs/wabt/template
@@ -1,6 +1,6 @@
 # Template file for 'wabt'
 pkgname=wabt
-version=1.0.19
+version=1.0.20
 revision=1
 build_style=cmake
 make_check_target=check
@@ -10,15 +10,15 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/WebAssembly/wabt"
 _gtest_commit=7888184f28509dba839e3683409443e0b5bb8948
-_testsuite_commit=d2163dace09d647bccf34b9b82a6f05a3b23cf29
+_testsuite_commit=18f83401a47a0e43772cf7d9f216e994bf7c7fa6
 _wasm_c_api_commit=d9a80099d496b5cdba6f3fe8fc77586e0e505ddc
 distfiles="https://github.com/WebAssembly/wabt/archive/${version}.tar.gz
  https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz
  https://github.com/WebAssembly/testsuite/archive/${_testsuite_commit}.tar.gz
  https://github.com/WebAssembly/wasm-c-api/archive/${_wasm_c_api_commit}.tar.gz"
-checksum="134f2afc8205d0a3ab89c5f0d424ff3823e9d2769c39d2235aa37eba7abc15ba
+checksum="39def40e8719030e0d11b1abbd81427fb1731c0372fcb24e2baaea067acba66f
  acc72b0cde04828fd4640576fdbd0727fc202f08b7701ae0bb318e2510f44b22
- 1ea206dba1b0826cf52e7a4b9328a341c75e8642072ab5e34356def380ad504d
+ 9d82be5b4dcfaadb9c0b0455c0c8b2989b942f75b9f698fa8e70329e403f4f74
  aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c"
 
 pre_configure() {

From dcf4a4d0f37f63564f734af0c4b38483a9014073 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Tue, 17 Nov 2020 04:14:56 +0600
Subject: [PATCH 0054/3595] zoom: update to 5.4.54779.1115.

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 263ad3c3bcb..65c56f37bb1 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.4.53391.1108
+version=5.4.54779.1115
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -11,7 +11,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=887080a5242b65b94b2be82eb22fac2e5c76fca0d316553506b2a1945dec856b
+checksum=9a3a60f9df617bcaae8a722724d6a3f3609ff2b16ae7efd0c88b1f8c6ea341cd
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 768f1596f69697d315a344ee0c403c59fdcfc80e Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Tue, 17 Nov 2020 04:13:06 +0600
Subject: [PATCH 0055/3595] vivaldi: update to 3.4.2066.106.

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 456c5e917cf..0d12db41f64 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.4.2066.99
+version=3.4.2066.106
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=fa77ebf344e6be01b47d3536a85825ef76c6f415cac871f133e66921c6604a43
+	checksum=21ae01166158e22464d67bfc77aa7f8fc929a23c2257e7068c21f1e9e3d2d00a
 else
 	_debarch=i386
-	checksum=6312a7584b393ce9a58096b86c3068cfed6f89172c9af526b49a1cd1577f8e29
+	checksum=ea6e60c3cc49ec3018a4c07e1d731b1e9d7596bac72e58e50996ee1d89ffe960
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From 2eb117a5443605f4baaded48eb8afa8d56736de5 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Wed, 18 Nov 2020 06:05:10 +0600
Subject: [PATCH 0056/3595] google-chrome: update to 87.0.4280.66

---
 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 51c5c857f17..2da4b0ec55c 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=86.0.4240.198
+_chromeVersion=87.0.4280.66
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=3d0055cf8db589d1bc6eb6504791d141e7008fb34cdb85bd1d194893c7d1d061
+checksum=e7e4c6a2108140c572562867f522d0311a25ce03ea36c5452cb8431865871226
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ae1bcd23c90b2324c5f9bd1316b65ca8477f9317 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Mon, 16 Nov 2020 05:58:20 -0700
Subject: [PATCH 0057/3595] pdfpc: update to 4.4.1

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c67a28ee0e5..bd8cb4c243e 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,6 +1,6 @@
 # Template file for 'pdfpc'
 pkgname=pdfpc
-version=4.4.0
+version=4.4.1
 revision=1
 wrksrc="pdfpc-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://pdfpc.github.io/"
 changelog="https://raw.githubusercontent.com/pdfpc/pdfpc/master/CHANGELOG.txt"
 distfiles="https://github.com/pdfpc/pdfpc/archive/v${version}.tar.gz"
-checksum=5fc457b081cdf02708436bb708940fd6b689e03fc336d3faab652f0b85592c00
+checksum=4adb42fd1844a7e2ab44709dd043ade618c87f2aaec03db64f7ed659e8d3ddad
 
 if [ $CROSS_BUILD ]; then
 	hostmakedepends+=" libgee08-devel"

From 9c56446074296448ab61556c52af76a5b911f52c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:34:05 +0100
Subject: [PATCH 0058/3595] man-pages-posix: update to 2017a.

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

diff --git a/srcpkgs/man-pages-posix/template b/srcpkgs/man-pages-posix/template
index 67cc6831fbb..58deb2f360e 100644
--- a/srcpkgs/man-pages-posix/template
+++ b/srcpkgs/man-pages-posix/template
@@ -1,16 +1,16 @@
 # Template file for 'man-pages-posix'
 pkgname=man-pages-posix
-_distver=2013
+_distver=2017
 _revver=a
 version="${_distver}${_revver}"
 revision=5
-wrksrc="${pkgname}-${_distver}-${_revver}"
+wrksrc="${pkgname}-${_distver}"
 short_desc="Manual pages about POSIX systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="POSIX-COPYRIGHT"
+license="custom:POSIX-COPYRIGHT"
 homepage="https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/"
 distfiles="${KERNEL_SITE}/docs/man-pages/man-pages-posix/man-pages-posix-${_distver}-${_revver}.tar.xz"
-checksum=19633a5c75ff7deab35b1d2c3d5b7748e7bd4ef4ab598b647bb7e7f60b90a808
+checksum=ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3
 
 do_install() {
 	make all prefix=${DESTDIR}/usr

From 92ea9224b0b4a1ab7f721e7ef34676af5296c4f7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:29:33 +0100
Subject: [PATCH 0059/3595] lsof: update to 4.94.0.

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

diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 2d12a9c7471..2c13c23beed 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,7 +1,7 @@
 # Template file for 'lsof'
 pkgname=lsof
-version=4.93.2
-revision=2
+version=4.94.0
+revision=1
 build_style=configure
 configure_script="./Configure"
 configure_args="-n linux"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:lsof"
 homepage="https://people.freebsd.org/~abe/"
 distfiles="https://fossies.org/linux/misc/lsof-${version}.tar.gz"
-checksum=3df912bd966fc24dc73ddea3e36a61d79270b21b085936a4caabca56e5b486a2
+checksum=a9865eeb581c3abaac7426962ddb112ecfd86a5ae93086eb4581ce100f8fa8f4
 
 pre_configure() {
 	export LSOF_CC="$CC"

From 698aedcb1d5b2743cad0fdcf61927d992d30be25 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Thu, 12 Nov 2020 13:03:49 +0530
Subject: [PATCH 0060/3595] dbeaver: update to 7.2.4.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d361dd4e6bc..b1f95ae640f 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.2.3
+version=7.2.4
 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=320fd606b1e18c5361ae355cbcb441d9d6856d0fff74fa90a223bb00bb55288d
+checksum=355a302622a7fc8d9a083c40fb6d8dacafeda7d8eb0505db2e2d0da024178541
 nopie=true
 
 do_build() {

From ab7437de71f54a9b40d64445fec5cc7a79881584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Mon, 9 Nov 2020 19:20:39 +0100
Subject: [PATCH 0061/3595] mumble: add sndio support via portaudio backend

Thanks to feranur for providing this patch
---
 srcpkgs/mumble/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d1f5db2b210..981e3ab8f06 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -5,12 +5,13 @@ revision=2
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
- $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations CONFIG+=no-oss"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3"
+ $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
+ CONFIG+=no-oss CONFIG+=portaudio"
+hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
- speech-dispatcher-devel speex-devel"
+ speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From f5321c9e1f7594cc80da24823cbbefaf000db49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 19 Nov 2020 09:54:20 +0100
Subject: [PATCH 0062/3595] icecat: fix checksum

The previous one was wrong. It was that of the firefox-esr-78.5.0 tarball
used to create the icecat-78.5.0 one with makeicecat.
---
 srcpkgs/icecat/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index d68904d5089..94631d77d95 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -19,10 +19,6 @@ 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=377feaa13de7ca4c930d69a0c0109f0a38d4fb7fed71b6db42cb1c798cdd95ed
-
-broken="checksum reported by pullmoll
-	51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
-	I don't know which one is correct?"
 lib32disabled=yes
 #nocross="warning: src/compiler/glsl/glcpp/glcpp-lex.l:622:1: fatal error: opening dependency file .deps/forc e-cargo-library-build.pp: No such file or directory"
 

From 8677374bb3cd692e503ed0bf0f3bc4d97048c4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 19 Nov 2020 11:14:20 +0100
Subject: [PATCH 0063/3595] pdfpc: fix build

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

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index bd8cb4c243e..3c6f50c8dec 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -6,7 +6,7 @@ wrksrc="pdfpc-${version}"
 build_style=cmake
 hostmakedepends="pkg-config vala"
 makedepends="gst-plugins-base1-devel gtk+3-devel libgee08-devel
- poppler-glib-devel vala-devel"
+ libzstd-devel poppler-glib-devel vala-devel"
 short_desc="Presenter console with multi-monitor support for PDF files"
 maintainer="Aaron Marcher <info@nulltime.net>"
 license="GPL-2.0-or-later"

From 7abda6240a631be23c33f5893e24a07f9f089368 Mon Sep 17 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, 19 Nov 2020 17:55:19 +0700
Subject: [PATCH 0064/3595] elfutils-devel: depends on libzstd-devel

See libdw.pc
---
 srcpkgs/elfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 9039ee1bada..a2a10ab6e63 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,11 +1,11 @@
 # Template file for 'elfutils'
 pkgname=elfutils
 version=0.182
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"
-_devel_depends="bzip2-devel liblzma-devel zlib-devel"
+_devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
 short_desc="Utilities to handle ELF object files"

From fecd9f8bb36aa43d7a42090fb9c2123db562f89f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:56:29 -0600
Subject: [PATCH 0065/3595] ModemManager: update to 1.14.8

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

diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 3cceb346807..aacb3f5c0c9 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,6 +1,6 @@
 # Template file for 'ModemManager'
 pkgname=ModemManager
-version=1.14.6
+version=1.14.8
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/ModemManager/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=783d5da925b2ca69f6233fcead691dd0f5cba06aa479d71495efdc07053fc0fd
+checksum=fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295
 
 build_options="gir"
 build_options_default="gir"

From 80e6535c17fc8d085356c3cb8c12e5adb4f88407 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Mon, 16 Nov 2020 14:54:26 +0900
Subject: [PATCH 0066/3595] direnv: update to 2.24.0

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

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 4cedd11df05..af1824cc9e9 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,16 +1,16 @@
 # Template file for 'direnv'
 pkgname=direnv
-version=2.23.1
+version=2.24.0
 revision=1
 build_style=go
 go_import_path=github.com/direnv/direnv
 short_desc="Environment switcher for the shell"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Sora Morimoto <sora@morimoto.io>"
 license="MIT"
 homepage="https://direnv.net/"
 changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md"
 distfiles="https://github.com/direnv/direnv/archive/v${version}.tar.gz"
-checksum=12e01b1df182541654a39c8d631140cf528bfdca6c492545c7e6455748503efa
+checksum=a0993912bc6e89580bc8320d3c9b3e70ccd6aa06c1d847a4d9174bee8a8b9431
 
 post_install() {
 	vlicense LICENSE

From 69279eb26a36c485efeb1d325f0a7a6e0ead5eb0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 19 Nov 2020 14:17:02 +0100
Subject: [PATCH 0067/3595] thunar-volman: update to 4.15.1.

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

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7592fb1729c..b2aafc878cd 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,6 +1,6 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
-version=4.15.0
+version=4.15.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://git.xfce.org/xfce/thunar-volman/plain/NEWS?h=${pkgname}-${version}"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=c17d1948ad6eeb689cf83443a7826ac9bfab6772d8458735da5c0ee6c82f8983
+checksum=7528cd48d58467411cbcfeacb0e6ac24349952fc3d92d975d0e8fd341d43076b

From 18be5d6ba4bf059e7003028f769a6c9f9f78928b Mon Sep 17 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, 19 Nov 2020 08:35:49 +0700
Subject: [PATCH 0068/3595] tint2: split tint2conf out, build with -O2

Split tint2conf out to remove gtk+ dependency.
---
 srcpkgs/tint2/template | 18 ++++++++++++++++--
 srcpkgs/tint2conf      |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/tint2conf

diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template
index 21791e76790..4a15af5faea 100644
--- a/srcpkgs/tint2/template
+++ b/srcpkgs/tint2/template
@@ -1,10 +1,11 @@
 # Template file for 'tint2'
 pkgname=tint2
 version=16.7
-revision=1
+revision=2
 wrksrc="tint2-v${version}"
 build_style=cmake
-hostmakedepends="pkg-config"
+configure_args="-DCMAKE_BUILD_TYPE=None"
+hostmakedepends="pkg-config gettext"
 makedepends="gtk+-devel imlib2-devel librsvg-devel libXcomposite-devel
  libXdamage-devel libXinerama-devel libXrandr-devel startup-notification-devel"
 depends="desktop-file-utils"
@@ -15,3 +16,16 @@ homepage="https://gitlab.com/o9000/tint2"
 changelog="https://gitlab.com/o9000/tint2/blob/master/ChangeLog"
 distfiles="https://gitlab.com/o9000/tint2/-/archive/v${version}/tint2-v${version}.tar.bz2"
 checksum=ae2512355614014465f6aff36c98e2ed448998c44533157e4bace21c6c979f65
+
+tint2conf_package() {
+	short_desc+=" - configuration tools"
+	depends="tint2>=${version}_${revision}"
+	conflicts="tint2<=16.7_1"
+	pkg_install() {
+		vmove usr/bin/tint2conf
+		vmove usr/share/applications/tint2conf.desktop
+		vmove usr/share/icons/hicolor/scalable/apps/tint2conf.svg
+		vmove usr/share/locale
+		vmove usr/share/mime
+	}
+}
diff --git a/srcpkgs/tint2conf b/srcpkgs/tint2conf
new file mode 120000
index 00000000000..fce3ac895fd
--- /dev/null
+++ b/srcpkgs/tint2conf
@@ -0,0 +1 @@
+tint2
\ No newline at end of file

From 96dc13d32f7ebaf997f80ce042ddf5055b8a2a5d Mon Sep 17 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, 12 Sep 2020 07:57:27 +0700
Subject: [PATCH 0069/3595] etcd: build with vendored libraries

Also xlintify.
---
 srcpkgs/etcd/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..b255d53874f 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,15 +1,13 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.4
-revision=1
+revision=2
 build_style=go
+go_import_path="github.com/coreos/etcd"
+go_package="${go_import_path} ${go_import_path}/etcdctl"
 short_desc="Distributed reliable key-value store"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-hostmakedepends="git glide"
-go_import_path="github.com/coreos/etcd"
-go_package="${go_import_path} ${go_import_path}/etcdctl"
-go_mod_mode="default"
 homepage="https://coreos.com/etcd/docs/latest/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=46bcd0d034fe9cc6ae86a9f2a72bdc78761ca99bfd5ae4b96b24e4ad93fc627e
@@ -17,7 +15,10 @@ conf_files="/etc/sv/etcd/conf"
 system_accounts="etcd"
 make_dirs="/var/lib/etcd 0755 etcd etcd"
 
+post_extract() {
+	ln -s $wrksrc vendor/$go_import_path
+}
+
 post_install() {
-	vlicense LICENSE
 	vsv etcd
 }

From 229ac5410655a374e0a54f5ff888de282df58170 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Wed, 18 Nov 2020 15:33:39 +0100
Subject: [PATCH 0070/3595] srain: update to 1.1.3.

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

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 97159e991ee..7a28616db50 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,6 +1,6 @@
 # Template file for 'srain'
 pkgname=srain
-version=1.1.2
+version=1.1.3
 revision=1
 build_style=configure
 build_helper=gir
@@ -13,4 +13,4 @@ maintainer="avoidr <avoidr@posteo.de>"
 license="GPL-3.0-only"
 homepage="https://srain.im/"
 distfiles="https://github.com/SrainApp/srain/archive/${version}.tar.gz"
-checksum=b3628bbd3d5466b15d2b3fa881e8d3bf9552953c767b92002714019cdb8dca8c
+checksum=08f32c762eaf5e50a3a8b5374c49dc42df31f6730ad373495cc951701d0e319b

From 0635fdedba3d35e1b161b81302cc58038a9eb4a5 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 21:29:44 +0100
Subject: [PATCH 0071/3595] fuse-sshfs: update to 3.7.1.

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

diff --git a/srcpkgs/fuse-sshfs/template b/srcpkgs/fuse-sshfs/template
index 6ca7098266d..06afb31064d 100644
--- a/srcpkgs/fuse-sshfs/template
+++ b/srcpkgs/fuse-sshfs/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse-sshfs'
 pkgname=fuse-sshfs
-version=3.7.0
+version=3.7.1
 revision=1
 wrksrc="sshfs-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libfuse/sshfs"
 distfiles="https://github.com/libfuse/sshfs/releases/download/sshfs-${version}/sshfs-${version}.tar.xz"
-checksum=6e7e86831f3066b356e7f16e22f1b8a8f177fda05146f6a5eb821c2fd0541c34
+checksum=fe5d3436d61b46974889e0c4515899c21a9d67851e3793c209989f72353d7750
 
 case "${XBPS_TARGET_MACHINE}" in
 	i686|armv6l|armv7l)

From c2449983d7eeb44b32bf3a3ba9a63d167f7e6387 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:38:22 +0100
Subject: [PATCH 0072/3595] libheif: update to 1.9.1.

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

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 2b594485bea..caea16e12f0 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,6 +1,6 @@
 # Template file for 'libheif'
 pkgname=libheif
-version=1.7.0
+version=1.9.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
 homepage="http://www.libheif.org"
 distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=11645cf2536f779be82ba9c25854fb7211b0ac30458f4764f1f7de88763deb21
+checksum=2b0d5cf7e74d7aa45da4fe53fb8c1fbac04d2b1e2bef79723d6ef154d0514deb
 
 pre_configure() {
 	./autogen.sh

From 9c376a919bb75ea25a3d9de10e6a63a07e28bb92 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:37:04 +0100
Subject: [PATCH 0073/3595] lldpd: update to 1.0.7.

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

diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index 293c85aab91..ab623014425 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lldpd'
 pkgname=lldpd
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 configure_args="--with-privsep-chroot=/var/empty"
@@ -11,7 +11,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://vincentbernat.github.io/lldpd/index.html"
 distfiles="https://media.luffy.cx/files/lldpd/${pkgname}-${version}.tar.gz"
-checksum=25e15bc3407c1cbf2d0b2f21993561a57b7e2fdc5cebfcf6df4ce5ce376aaeec
+checksum=1df79179d489c841b49265f2ab5ff05f284a647e95862d2f3c02b3fb079a87e1
 
 system_groups="_lldpd"
 system_accounts="_lldpd"

From 85d57ad6d3e1896d32b54b8056a2d1641aea1d05 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:35:42 +0100
Subject: [PATCH 0074/3595] memcached: update to 1.6.8.

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

diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template
index 5a0c3151c97..a4f9bb53c9f 100644
--- a/srcpkgs/memcached/template
+++ b/srcpkgs/memcached/template
@@ -1,6 +1,6 @@
 # Template file for 'memcached'
 pkgname=memcached
-version=1.6.7
+version=1.6.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-seccomp"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="http://www.memcached.org"
 changelog="https://github.com/memcached/memcached/wiki/ReleaseNotes${version//./}"
 distfiles="http://memcached.org/files/${pkgname}-${version}.tar.gz"
-checksum=7bbdac9b031d8cfca4a1207f28df598b90ee2e9b44667f7eabd0fe1a59ca5173
+checksum=e23b3a11f6ff52ac04ae5ea2e287052ce58fd1eadd394622eb65c3598fcd7939
 
 # Rebuild configure script, due to patching configure.ac
 pre_configure() {

From 5c5a7fbf8c9876c878d7d663b621147164407ea8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:42:33 +0100
Subject: [PATCH 0075/3595] acpica-utils: update to 20201113.

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

diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index a47d5bf51af..d1840214ee2 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20200925
+version=20201113
 revision=1
 archs="i686* x86_64* aarch64*"
 wrksrc="acpica-unix-${version}"
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=d44388e21e3d2e47c6d39e9c897935d3f775f04fec76271dcba072c74f834589
+checksum=48c4e0c07b42581d017487cc9264470e6420605ddd24cbb5d16410d02a771461
 
 do_build() {
 	vsed -e 's/-Werror//g' \

From 874fe86d022e175b34ee6d8eb3be2d46356b0182 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:41:05 +0100
Subject: [PATCH 0076/3595] systemtap: update to 4.4.

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

diff --git a/srcpkgs/systemtap/template b/srcpkgs/systemtap/template
index 256a9a04b0b..4692bf3c4c4 100644
--- a/srcpkgs/systemtap/template
+++ b/srcpkgs/systemtap/template
@@ -1,6 +1,6 @@
 # Template file for 'systemtap'
 pkgname=systemtap
-version=4.3
+version=4.4
 revision=1
 archs="i686 x86_64 armv6l armv7l aarch64 ppc64le"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/systemtap/"
 distfiles="https://sourceware.org/systemtap/ftp/releases/systemtap-${version}.tar.gz"
-checksum=f8e206ed654c13a8b42245a342c1b5a4aafdf817c97bf3becbe3c8a43a4489ce
+checksum=ca70b6107537162ce401f8965a7e315950c1292c02ea50a490e77bd6fde5638c
 python_version=3
 
 systemtap-devel_package() {

From 90451fc74dc1634c327c10ddf12d20e45bb20b21 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sun, 15 Nov 2020 18:35:53 +0100
Subject: [PATCH 0077/3595] minio: update to 2020.11.13.

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

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index b35473f89aa..bda33dd292a 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2020.10.28
+version=2020.11.13
 revision=1
-_version="${version//./-}T08-16-50Z"
+_version="${version//./-}T20-10-18Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=3586eede2e20d871e5581dfc13eb9274bfba7bca4d29bb953f31203b8ff5766b
+checksum=acf8169ff57f28d7bedb3bceb30f323286fc5ec593b5d994c0b00f3d4d820c24
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 3fedfeecd71c6c4c5dbd6b3b8b54caed49296042 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 15 Nov 2020 10:54:14 +0100
Subject: [PATCH 0078/3595] perl-IO-HTML: update to 1.004

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

diff --git a/srcpkgs/perl-IO-HTML/template b/srcpkgs/perl-IO-HTML/template
index 491c642c769..cf201da0b6e 100644
--- a/srcpkgs/perl-IO-HTML/template
+++ b/srcpkgs/perl-IO-HTML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-IO-HTML'
 pkgname=perl-IO-HTML
-version=1.001
-revision=4
+version=1.004
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-HTML"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0
+checksum=c87b2df59463bbf2c39596773dfb5c03bde0f7e1051af339f963f58c1cbd8bf5

From aa5615c10a3440e8adb564f0e2a866a61d484cda Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 15 Nov 2020 09:01:41 +0100
Subject: [PATCH 0079/3595] sqlitebrowser: update to 3.12.1

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

diff --git a/srcpkgs/sqlitebrowser/template b/srcpkgs/sqlitebrowser/template
index 3398430b59c..45098f3418d 100644
--- a/srcpkgs/sqlitebrowser/template
+++ b/srcpkgs/sqlitebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlitebrowser'
 pkgname=sqlitebrowser
-version=3.12.0
+version=3.12.1
 revision=1
 build_style=cmake
 configure_args="-DUSE_QT5=1"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-3.0-or-later"
 homepage="http://sqlitebrowser.org/"
 distfiles="https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz"
-checksum=3f1a1453ed0f4b5b72b0468bf8ee56887eb23d71c2518a449f4eb179471d73d1
+checksum=c1f13a7caeab9c36908d7fd6e46718d5f2bb5d116882c5c6392e7c4b0f8dba0f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel qt5-tools-devel"

From 107ce22d40345dc820901cd35108f62497d96515 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 19 Nov 2020 11:04:35 -0500
Subject: [PATCH 0080/3595] intel-ucode: update to 20201118.

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

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 2eb9a1a3a13..a59663aaa04 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20201112
+version=20201118
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=aa27c6a138c440bc8b9c19145f02fbe7425c784feaf61e5cfa13346f9de9a927
+checksum=e42a264b7b86e80d013d6d00062467352c1f37e0aaea10fe5b51e4d8687921ab
 repository=nonfree
 
 do_install() {

From 878923a2d1a9bb12735f613690989bd52c4d0284 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 19 Nov 2020 11:04:42 -0500
Subject: [PATCH 0081/3595] python3-tifffile: update to 2020.11.18.

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

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index dbf2450c13a..25f5c5d5acd 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,18 +1,23 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2020.10.1
-revision=2
+version=2020.11.18
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-numpy"
+checkdepends="${depends} python3-pytest python3-lxml"
 short_desc="Read and write TIFF files"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 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=461c569d3704b4696ad7176bdb0575cb70f93c6715e7a175f9e0636302f3f63b
+checksum=8ec02abeaa1921e23264ba6810af52bf66bd1ba437bf5199458937c6f315355e
+
+do_check() {
+	python3 -m pytest
+}
 
 post_install() {
 	vlicense LICENSE

From 728cffb6164443966ee950393c1aeec040dc2b23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 19 Nov 2020 11:04:46 -0500
Subject: [PATCH 0082/3595] python3-pyopencl: update to 2020.3.

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

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 4daaa24eff4..43a5a3b8426 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2020.2.2
-revision=3
+version=2020.3
+revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
@@ -12,13 +12,18 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=31fcc79fb6862998e98d91a624c0bd4f0ab4c5d418d199912d4d312c64e437ec
+checksum=4aa3031c17fc99aa2f3018ef2c9e1d535c3cfdc7a01bb987b1ea3826ef42bd59
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \
 		--cl-lib-dir=${XBPS_CROSS_BASE}/usr/lib
 }
 
+do_check() {
+	# Tests require a working OpenCL platform
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From d51675d7afb7bddbd30fe022d4bf8236a0bea1ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 19 Nov 2020 11:48:25 -0500
Subject: [PATCH 0083/3595] python3-aiohttp: update to 3.7.3.

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

diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template
index 8cdc3b797e5..2f750504163 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,28 +1,22 @@
 # Template file for 'python3-aiohttp'
 pkgname=python3-aiohttp
-version=3.7.2
+version=3.7.3
 revision=1
 wrksrc="aiohttp-${version}"
 build_style=python3-module
-hostmakedepends="python3-Cython python3-setuptools"
+hostmakedepends="python3-setuptools"
 makedepends="python3-devel http-parser-devel"
-depends="python3-async-timeout python3-attrs python3-chardet python3-idna-ssl
- python3-yarl python3-typing_extensions python3-multidict"
+depends="python3-async-timeout python3-attrs python3-chardet
+ python3-idna-ssl python3-yarl python3-typing_extensions python3-multidict"
 short_desc="HTTP client/server for asyncio (PEP-3156)"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://aiohttp.readthedocs.io/"
-distfiles="https://github.com/aio-libs/aiohttp/archive/v${version}.tar.gz"
-checksum=22ed7395d53c03f0f4872e5cdd051330bbce33f3d81b0af9aefd48a7077db040
+distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
+checksum=9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4
 
 pre_build() {
 	# use system http-parser
 	sed -i '/http_parser\.c/d' setup.py
 	sed -i '/http_parser\.h/s/".*\//"/' aiohttp/_cparser.pxd
-
-	# Ships without cythonized modules
-	local _pyx
-	for _pyx in aiohttp/*.pyx; do
-		cython -3 -o "${_pyx%.pyx}.c" -I aiohttp "${_pyx}"
-	done
 }

From 6e6105225c44fc2f086f275a2c652aa23d95e919 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 17 Nov 2020 16:43:26 -0600
Subject: [PATCH 0084/3595] python3-altgraph: update to 0.17

Add check target
---
 srcpkgs/python3-altgraph/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-altgraph/template b/srcpkgs/python3-altgraph/template
index a1ad53d67a1..4a1c1462158 100644
--- a/srcpkgs/python3-altgraph/template
+++ b/srcpkgs/python3-altgraph/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-altgraph'
 pkgname=python3-altgraph
-version=0.16.1
-revision=3
+version=0.17
+revision=1
 wrksrc="altgraph-${version}"
 build_style=python3-module
-pycompile_module="altgraph"
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3-setuptools"
+checkdepends="python3-coverage"
 short_desc="Fork of graphlib for building network graphs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://altgraph.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/a/altgraph/altgraph-${version}.tar.gz"
-checksum=ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c
+checksum=1f05a47122542f97028caf78775a095fbe6a2699b5089de8477eb583167d69aa
+
+do_check() {
+	python3 -m coverage run --parallel setup.py test
+}
 
 post_install() {
 	vlicense LICENSE

From 02ca96809fb025a46af868c98e69464f143aed82 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 17 Nov 2020 17:16:51 -0600
Subject: [PATCH 0085/3595] python3-bleach: update to 3.2.1

Fixes CVE-2020-6816
---
 srcpkgs/python3-bleach/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index 34ba5371b45..e1951883ea8 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-bleach'
 pkgname=python3-bleach
-version=3.1.1
-revision=3
+version=3.2.1
+revision=1
 wrksrc="bleach-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-webencodings"
+depends="python3-six python3-webencodings
+ python3-packaging"
 short_desc="Easy safelist-based HTML-sanitizing tool (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/mozilla/bleach"
 changelog="https://raw.githubusercontent.com/mozilla/bleach/master/CHANGES"
 distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz"
-checksum=aa8b870d0f46965bac2c073a93444636b0e1ca74e9777e34f03dd494b8a59d48
+checksum=52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080

From c52e5e4a2a612fc8d0e83c00a0b1b63ba7f937be Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 17 Nov 2020 20:02:11 +0100
Subject: [PATCH 0086/3595] firefox update to 83.0

---
 .../firefox/patches/avoid-redefinition.patch  |  4 +-
 .../patches/fix-webrtc-glibcisms.patch        |  4 +-
 srcpkgs/firefox/patches/qcms_neon.patch       | 65 +++++++++++++++++++
 srcpkgs/firefox/patches/sandbox-fork.patch    |  4 +-
 srcpkgs/firefox/patches/wasm.patch            | 62 ++++++++++++++++++
 srcpkgs/firefox/template                      |  4 +-
 6 files changed, 136 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/qcms_neon.patch
 create mode 100644 srcpkgs/firefox/patches/wasm.patch

diff --git a/srcpkgs/firefox/patches/avoid-redefinition.patch b/srcpkgs/firefox/patches/avoid-redefinition.patch
index 0f17779c401..22eb8baa1b5 100644
--- a/srcpkgs/firefox/patches/avoid-redefinition.patch
+++ b/srcpkgs/firefox/patches/avoid-redefinition.patch
@@ -3,8 +3,8 @@ Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
 (linux/if.h), leading to redefinitions. We need to include net/if.h before
 linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
 Upstream: No
---- media/mtransport/third_party/nICEr/src/stun/addrs-netlink.c.orig	2020-07-28 19:24:32.359751046 +0200
-+++ media/mtransport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
+--- dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.orig	2020-07-28 19:24:32.359751046 +0200
++++ dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
 @@ -31,6 +31,7 @@
  */
  
diff --git a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
index cf895dd8448..e38d1b9dd8f 100644
--- a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
@@ -1,5 +1,5 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
-+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+--- third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
++++ third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
 @@ -14,7 +14,7 @@
  #ifndef __GLIBC_PREREQ
  #define __GLIBC_PREREQ(a, b) 0
diff --git a/srcpkgs/firefox/patches/qcms_neon.patch b/srcpkgs/firefox/patches/qcms_neon.patch
new file mode 100644
index 00000000000..7b19e0c30f7
--- /dev/null
+++ b/srcpkgs/firefox/patches/qcms_neon.patch
@@ -0,0 +1,65 @@
+this is still experimental in rust-1.46 for arm and aarch64
+
+--- gfx/qcms/src/lib.rs.orig	2020-11-17 22:03:09.868746869 +0100
++++ gfx/qcms/src/lib.rs	2020-11-17 22:03:27.795605120 +0100
+@@ -47,8 +47,8 @@
+ pub mod transform;
+ #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+ pub mod transform_avx;
+-#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
+-pub mod transform_neon;
++//#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
++//pub mod transform_neon;
+ #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+ pub mod transform_sse2;
+ pub mod transform_util;
+--- gfx/qcms/src/transform.rs.orig	2020-11-17 22:15:03.413104913 +0100
++++ gfx/qcms/src/transform.rs	2020-11-17 22:15:17.128996464 +0100
+@@ -21,11 +21,11 @@
+ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
+-use crate::transform_neon::{
+-    qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon,
+-    qcms_transform_data_rgba_out_lut_neon,
+-};
++//#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
++//use crate::transform_neon::{
++//    qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon,
++//    qcms_transform_data_rgba_out_lut_neon,
++//};
+ use crate::{
+     chain::qcms_chain_transform,
+     double_to_s15Fixed16Number,
+@@ -1424,18 +1424,18 @@
+                         (*transform).transform_fn = Some(qcms_transform_data_bgra_out_lut_sse2)
+                     }
+                 }
+-            } else if cfg!(any(target_arch = "arm", target_arch = "aarch64")) && qcms_supports_neon
+-            {
+-                #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
+-                {
+-                    if in_type == QCMS_DATA_RGB_8 {
+-                        (*transform).transform_fn = Some(qcms_transform_data_rgb_out_lut_neon)
+-                    } else if in_type == QCMS_DATA_RGBA_8 {
+-                        (*transform).transform_fn = Some(qcms_transform_data_rgba_out_lut_neon)
+-                    } else if in_type == QCMS_DATA_BGRA_8 {
+-                        (*transform).transform_fn = Some(qcms_transform_data_bgra_out_lut_neon)
+-                    }
+-                }
++           // } else if cfg!(any(target_arch = "arm", target_arch = "aarch64")) && qcms_supports_neon
++           // {
++           //     #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
++           //     {
++           //         if in_type == QCMS_DATA_RGB_8 {
++           //             (*transform).transform_fn = Some(qcms_transform_data_rgb_out_lut_neon)
++           //         } else if in_type == QCMS_DATA_RGBA_8 {
++           //             (*transform).transform_fn = Some(qcms_transform_data_rgba_out_lut_neon)
++           //         } else if in_type == QCMS_DATA_BGRA_8 {
++           //             (*transform).transform_fn = Some(qcms_transform_data_bgra_out_lut_neon)
++           //         }
++           //     }
+             } else if in_type == QCMS_DATA_RGB_8 {
+                 (*transform).transform_fn = Some(qcms_transform_data_rgb_out_lut_precache)
+             } else if in_type == QCMS_DATA_RGBA_8 {
diff --git a/srcpkgs/firefox/patches/sandbox-fork.patch b/srcpkgs/firefox/patches/sandbox-fork.patch
index 72640cb7f70..8f7c9ab8201 100644
--- a/srcpkgs/firefox/patches/sandbox-fork.patch
+++ b/srcpkgs/firefox/patches/sandbox-fork.patch
@@ -2,12 +2,14 @@ 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 @@
+@@ -1420,6 +1420,10 @@
          // usually do something reasonable on error.
        case __NR_clone:
          return ClonePolicy(Error(EPERM));
++#  ifdef __NR_fork
 +      case __NR_fork:
 +        return Error(ENOSYS);
++#  endif
  
  #  ifdef __NR_fadvise64
        case __NR_fadvise64:
diff --git a/srcpkgs/firefox/patches/wasm.patch b/srcpkgs/firefox/patches/wasm.patch
new file mode 100644
index 00000000000..a905aaa1f96
--- /dev/null
+++ b/srcpkgs/firefox/patches/wasm.patch
@@ -0,0 +1,62 @@
+From 71597faac0fde4f608a60dd610d0cefac4972cc3 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Tue, 17 Nov 2020 12:56:17 +0000
+Subject: [PATCH] Fix GCC build failure in WasmBaselineCompile.cpp
+
+GCC does not yet implement C++ Core DR 727, so explicit specializations
+at class scope aren't allowed. This replaces it with a different C++17
+feature: using if-constexpr inside the function body and checking the
+template argument there.
+
+See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690
+and https://bugzilla.redhat.com/show_bug.cgi?id=1897675
+---
+ js/src/wasm/WasmBaselineCompile.cpp | 24 ++++++++++--------------
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/js/src/wasm/WasmBaselineCompile.cpp b/js/src/wasm/WasmBaselineCompile.cpp
+index 676dbfa73d33a..b82aa242d3c6b 100644
+--- js/src/wasm/WasmBaselineCompile.cpp
++++ js/src/wasm/WasmBaselineCompile.cpp
+@@ -655,15 +655,13 @@ class BaseRegAlloc {
+ 
+   template <MIRType t>
+   bool hasFPU() {
+-    return availFPU.hasAny<RegTypeOf<t>::value>();
+-  }
+-
+ #ifdef RABALDR_SIDEALLOC_V128
+-  template <>
+-  bool hasFPU<MIRType::Simd128>() {
+-    MOZ_CRASH("Should not happen");
+-  }
++    if constexpr (t == MIRType::Simd128)
++      MOZ_CRASH("Should not happen");
++    else
+ #endif
++    return availFPU.hasAny<RegTypeOf<t>::value>();
++  }
+ 
+   bool isAvailableGPR(Register r) { return availGPR.has(r); }
+ 
+@@ -746,15 +744,13 @@ class BaseRegAlloc {
+ 
+   template <MIRType t>
+   FloatRegister allocFPU() {
+-    return availFPU.takeAny<RegTypeOf<t>::value>();
+-  }
+-
+ #ifdef RABALDR_SIDEALLOC_V128
+-  template <>
+-  FloatRegister allocFPU<MIRType::Simd128>() {
+-    MOZ_CRASH("Should not happen");
+-  }
++    if constexpr (t == MIRType::Simd128)
++      MOZ_CRASH("Should not happen");
++    else
+ #endif
++    return availFPU.takeAny<RegTypeOf<t>::value>();
++  }
+ 
+   void freeGPR(Register r) { availGPR.add(r); }
+ 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 716d932356b..8383fcc952f 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=82.0.3
+version=83.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=4df40aecf4b71107c4816db585bcd425f093123f29d8563bc2443a8659058691
+checksum=d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398
 
 lib32disabled=yes
 

From 607219808d280b2b357013b9221b6b2af7d11f39 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 18 Nov 2020 22:07:47 +0100
Subject: [PATCH 0087/3595] firefox-i18n: update to 83.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index f191a73a57e..2710c0df861 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=82.0.3
+version=83.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="5514206e7f44214f3c39bca279f9bab57d0678d3de27179d3ce8c31cbd1993d0
- 4ef22df523a86b4a3d4c0727894f192a1d314250cddfe428f6a0aa7f3dc67349
- 0bda85b614cce9cff8d29f50f330abd467f5bedeeacc1060a83899a708f17977
- 2ce68308195cf7d323a6a1f0ba7afda77c641bee7a35b03d0413dd7759a676df
- 26242521dde6b9506c38b1b6793b5b74523a6818af9b31bc809278ff8480ad63
- a7764763adcfce9a9ca7ff3ab23f0d3bcdb5eba681a20e16c169c90b29e902f4
- 9b87238a74b1ab3167db45576cb81f56c9f2caf99dc96d9cfb2d23b2c32f4149
- 98a22b059d5f2d8ff2c06736f41930141599af50489dce5e0d57af714f558fe8
- 9358d85e5872a6366f5fefc5aa273328f0d4bcea5c99116d24ce06855aa4b06a
- 156da1b0a75f4aea7c22a5c7e01910c2ae69d9e5843c2cf70a009330c1f53a0a
- 93232cccacf3b0dae4abffec9a034bdee079e5a15586ebb8442fbe1451c31cd0
- 25e1591c5b28966096f79a6136b89c11200a123bde1084e8b8b1fcda0659725f
- 37328b286ea2c7183da9d23296c87b69327cdfdb24f3a88d97e2c81bd7fe8efe
- fcce82357cf018c15f7d31cfd6dac98f7c5f4638003b60cd4d95ed4278e10bf5
- 6971ae4f97791864cc40ecd77f00b2037ccc8221ac4e72036408f5305b2e9b1c
- ef0734f1d4d879d065dc390965f49a63fc96563a4b4b6e759ebb9c6c10389bf6
- 96e8c0be96a8f7274f5d704d352db772e36315310c2b1a645ad03584408f01bd
- 4958880c3cee8c284fad069627deb252f9e2cd1a7cce39abd7136cb9102b8c08
- 0ce2126ebd227b4937c4d6979b4af9f3ea42d3e8c8b20338c5a33f158e13864c
- 9ba2e4f71268acbf123cb64a82b23f8968dd106cce6b8ca623f25a389e2768f9
- c87fa995402ede4418955c4f0a048d9f3a28357c044715632bfba989bc88e89a
- 50fa9eb50529937bfc2981f8e596aaf5212abac4215e4ba1e08f27d9941d1597
- 9996260d4f532528b556ff417ec47e271670c92bd6ce237ce4e9498f55e4be4a
- 71ed166233bafaee3c1cfe8630d7a99f07143284aec192d6a89ba68b9573f1c4
- 2e60b360e5b48f3066dd7219b4614b969e65dbe18e7ac028e772d3044bb0395e
- 28b66a552bc8a982d4a1858f8630a888a1127717ec76d3f88b5cca1f22fc4aa6
- 286695d8f356ef0dcfdde343c6923325cc6b4de08ca6f72ad6a8474d993ef6d1
- 773c5296fec3747e96207a541c080d48352171f87c25a99238356605cbbf9b94
- 4104565143301c94b39966a50fab71d57e458d9c501a73ea86d55af5d20c4246
- ef0a3f45d7ebd0087e37fd6080fdf1191a4b8bce88c1c9aa11c96ce5d53cffc1
- 63890546a50523c3a39fe53d55d85486cb06a09d80ce816aadc0c5b6173eca7b
- ad2cf24f020eb718cc79bc14f57f5b6d37ffb837104b23183ea59680f664dbdf
- 5ad2e0c759db2d0311a38b579c63309e6a27a86872bd3c67d30b76e133f3419f
- dfbf8e4e1db766a44a77e9c496e04e5d780e62092630780fe4b42d371ec5cbe3
- 1b0c49c006862ffa5841b9b147a3b5bb5f3a4d29fbbc0e761c91e5491ff7944d
- 676fcc1cdc12afb799a045b96ff5d1fdd8935dd58f4113b4c716fd4fa6f090ea
- 2ea51c7d92d82a8442a4f5dd00bac42fc4254a287c4f0ecd21527befe348abef
- 498f6b742347fbe072f3031aff5f3b25ca53b4128efdae42a72977f45986afa8
- e037c9ca7ef6daa1aecf5e9174cea8ae8b4089c3773625a2e8a857f9582a5d34
- 74b965ca5095d970e566d2afe3794a5394df0fad41791d37bd6933e417085225
- b346add39e55e8e42c1b25a492d98d038bfbca982c9ab7902886077e7452ebc2
- 99e07b0deaa86cd4da94ed145f733585caa54f8ee8f21f478a5493a1162fb46d
- b5482baf0702bd02a7faac2ecb2c7bf8fa81802532c200f356aa0179a150e63a
- d4a96870091db124bb895717b048affddad3c97bfb8496fe3699af34f9346455
- cd624e1b0c851fe5a19b7464edeb10abae3953956e290b847333f842c0e2c358
- 279f96954d82024af9d85a2d98a1b0a6ce35a41525aa0d1c98e24cc04a92521e
- bbaf1cf4865f202d0a57be95f04a70d53688d19ca54ecf15532badba6d6f721e
- a6f3a85aee1a35d17ca33d944f7f7888d80ed2a99e829a08e102398952421409
- de0e3efa4373d7c1d6b35ea5a604666cad6389e67098ab30db99553a9c85b45a
- 97321d14c7cfe5da7f537b9c6a2e2a1ded32d1d3ccbd7b595364b34d39c71634
- 85ddf51aaec9b95f072f98c219e7b0940f2c06a436f7f77839dcb210c4b1378a
- c9e495c629d21a841b0313c6e82b44153fbb811e3e133dec4a03135eb1dddd2e
- 218e5e3781ac629490fd5c4bcfeb665a1699b7d847ae4fd5068470b193246c00
- aa51a3adfe854f1fd731b96ebff54624a0bb36ab315dede6abb9a7ee37cbb828
- f749e9b0330a0347d7ae0e2e9ff52d708586ed7caff20a2639a0b7516b0468cc
- ab764f80572ca17cd2e9d868e400397f71cbdfc2451c7755878cefe2dcdb6db0
- 08083f5613e9b38d5fed37b19ec26bf006a1f25de9238068943b0eacac4ff848
- 2cd8a556b7ccacfe16559a472fb6ee2381516f94a56e96af79a8b53f27219cda
- fbbbfeda3cdb3c876447bc69fe1bc66f19302b262b41a6c77540fd114b8a98bc
- e5e3abef092369799cdf55b65a82011c2348daf236d85ddaaaa60d6e7bdd4e33
- f0c522fdc8bb316fb4fbe340ae762e1c16ce3d78d85094926278aea3daceef51
- a652c781e31b8164639e29e2f1ef13d7292d03022089d0983ee1f5f1934c2bf2
- a7e8d0aaafd06710f07312859f0f3cb46ff3444d4fd9aca57ca044c5a9050652
- 86c54f1260360febfa0bbcb58668402d9db13ed00a965a0a071c6c9ad93f2815
- dc3204e90558d2ac35505f0171f9d815e297a013e9c373b3b2b6b2e739461f78
- b187e008e022f88acd365f68cdc992ebc8f3100e46db3b89e0fa02cba311e98a
- 069def30d7864b2452bc14a584c129f9dfe2f6a26fae296ea5cb2350dcc1bf81
- 4c7c2b92168b67eabe76e08fb9c27a60307aa61c61095de1d3af2bbe5d8780a7
- 64685394baec35ff9753c77eb70feac5f7806f03050f62ae6ef3ff74595d8839
- f99d66ff27975557bbe452d66292503534b898cc935ad1fd5017b9cd6ec1fd27
- c20e02c0e02e9549b4cce131ddc5f874b236fcde3ad672df11696b741465cd62
- 5632d1698dd6a9119bdd0be326ad1ef54e43cd5a9de1a5fb6b97ac31e5674e09
- 2738ea85d7e0404441d4391f806915399872606b1eded842e0358ad13349029b
- ab2d8e45778a6bac60570798e344b8bc3fc016383b10f2af52be9e8232ddcd1f
- dadab90e8d5ae5ad8898f6ad35123fc61a8f0c99c1fff2e09ba70b30ff65a06c
- 50afef352f62f41d403bb45a1bdec5de94e904d5fc0dbc3f74d725014ff415bd
- a13c05c8c4d212f1510d1e98c910ed3d1004e33ad5ea119b3208fa46ea130b56
- 1b2864463f7f78219553493fab07617cee6b1270464e96380e2094e0a48cba7a
- 0913baf2eafcc3e84b7f92c8bdb63b9a4693759b392fa96314d6530df767c1de
- 167c0780f7ca979b97946b4e061bc468a4148169e90ce9c4ff3191a53cfb0758
- f92d646eeffcfe4f7adebac6c9aa9efbdc2c7b24823a170cd27fff547288245a
- 14866188eec0b40cf834b06ddfc2539d8f1185d55f157a8244216c1e0077877b
- 7d1ad9233c6137420fe6de01c52ce72015fdf0e8a60f73b36579c47d104733ba
- b93e5fdbd23520346d90d416dfc939cb8917d69e596c661a1985483c5f8e4b8f
- 513834b39831fccfede23867ed86775c33996be3de7042e73bb5b6ffb340bb81
- 08ffee7c586bfed9113ffa489cacc7a260aff1df09047fdb1dd48ae6d48f0785
- 9a5854130f904b8596e53a3a4b77b4d595727603c99e8f24674b2a4de4c13f7c
- c4308fb31233f5c2430ceb760727bd506d3e8ccfbe5b14fe5700a0c1590799de
- f4813aad53de25676e87a3a811b1037603a83c064485ccfd97234b08c53e45e0
- fcda650744c1522f44d9c0f27a22e489662f8070c7156179771cf0f373ca5086
- 6ab8fd80a01eeff038cdc2bd4252575dbc5ba39e189982b97bb2f6080f337608
- 4831cd2df36d59e8e7cfe584dbe25991186ec5b90b114c78c05db91329b7f522
- f07ce9c2d27937e29c25efef5f13191b611e6556c26fc4b449add4f4410ffffa
- 6e61751d1a55a6386c27cc6f038e292876064db21f317a5c77a2717f7d46faec
- 562ced1cd3f33057919280cf370d390958abbdbe210aa772d5bb57250e4792a6
- 1ba33e2383e582a04c8a6979c80ed450403273944fe1adb1d43cae4e29ad1662"
+checksum="e8dcb0ec4400349637b1f333012a4df729080cd5fbdb7478414fc53875b54d16
+ e43201660ea435d2b9c9059c012e86514e9c9a20890131847a9f39206b23f657
+ a6f12f990523adf3eccbcae2c71f32f8499682f4672d902763c8eb53da450653
+ c68247fab37710876f19e6ad5c5a3372b74f24805512c0d99b0b3d6a5590a733
+ f8498364d19f34bdf4b34bace6683baf17854975040dfef0e4d88c7eecb2223b
+ 7f8a503eb25f7960efdc00cc70d4ce4493eec898051e5d2394914925b10a5093
+ b733dfa35006b1dca5c82c8945345b0ddf9a8ed653da0b3d65cebacb52cc68a0
+ d3aabab8b4dc6ce7c93295f05fb438ba0802435ad963a68947d87e10f8a8bf82
+ f73791ddb70e0dd817d5a5b2171cd2f731482eec2c3260023b66699e562fcab9
+ a19aa3cb4a08c33ef27493a2e8e4f139b9fbe1c685a2eb6b9c1a8d65fb826854
+ 6143acdde106ce3741ff3e9a8728ed9b0b862c86791502803761271ab39c7fdf
+ 5f99d37dd82f43ffb87110cd531cbbb18d9626747cf7734037bb12b3e8142487
+ 11b39e02beb72dc43172a223a51404cd44802017b99ddcae2dcd015f976ecf73
+ ba524fbd87c9d2c8202ad5d813f06a37bf663fafec9672a1c1fef081b7b80878
+ 2261f199e1f871b2f1f9002e246d66c9daf5abb7663e7e5397acd3d68004dce9
+ e0a8adbf1d3016b43e6cf6bc4b3dc3968815b42ddd437bc5663990ef8fde2145
+ 8089bc2fb7529b20cbed40e0ecd8945cbf03942207d1e0fbdd1a1dab117c56da
+ 0abf6811aa5cdb17ea711f9942c0ec31960ab2888d5f444d0352f5ba605ec6de
+ 3be1ca38db44e1dfe9498d8ef9aef03c0249540385569d4b96ab703ea0d11dad
+ 7b7ca80ffa8836c8bfa3af5bdc5a0ecef7829abbcdf0f2a7459b7b456d7b385b
+ 9cbba55711a62cb017e0cfaf74158956e39ef2b5912e50b28ad52eec56032509
+ aa0337945a17ddce4e0b67f86a7f92596daf890995a63fdbe9d7f0a1c3cf00b6
+ 02ab1b80c16f8eea11a51fe155eebb48799dff08e6369c51ac7195a78ce2a5f4
+ 0a5433ab6abb9d6d57feeb6f437c560afd312cd450ec784b4a68a9e9f3c9bd2b
+ 16334002a2a3c42890547101c35bc7eb64bd220704241475abc4f975e242a42d
+ 3dac17dde3583cbfcf1e8e62a03e6c5844769a2a5b3d6d2256a9c726cf64b9c7
+ c5d974818cfeeaf54a4126270c8867bd5f9164395c0952bbc5050b5bad3ad891
+ 0da793b3d786c2073e5230f8110f855e302b71eb1e6c20273e01d15627750ecb
+ d457f4a168e39bf32ae49388cb9c4acb65eeba898669d4cf024d0782117018d8
+ 90081533700831a47d1a8a9f801284269fc8102325294e9c5b9a6ca9f81fb2c6
+ 189305fc3ab8627fc2799ab987b6dc5b6508ecbc49490a008c9548559b75e3cd
+ 70ec3f2c542a50ed2ba97943a55d121af05beb84dca9a6b0e3a8697c645b20b7
+ 0d0f882d7b1c99ecb4375f07a6ac442ce04214e1692f879df0f8f472203655c1
+ 8d9a8acbb05c4f691a3056069828a893bb9491f48cc235ce200316ac505370bd
+ 6fa3d4de1b3732601a64743a48411904b0eddb3feeb25f4ce7318ea4991cbc21
+ 3bb0201f8ff0ce84cd1968b6e7151db7f526ffdad93eab36f50acd92f18a55d2
+ 838e2a7f62edd74b4167b08ae11f13bd8b48964524500534b8dda7dc705d8f3f
+ 4905047d278100d0b72955e896a6c1f3cc093a52f73e8943b7eaafd05f04e5ae
+ 31f07b11c9a5348ea4a3f2c3b6e9068c0284b86de158c2bedcc0340f31ef3000
+ 17fe88532c0c1712c5905341fe0a7fb6f1383a9b2574e0032b99738aeff9dd66
+ 6cc9d24ef3d883acd1751f537497b0ed5f066de5ee5fc5af03d820a9eeae35bc
+ 9171e1594b89d47da9ee00bd5bbe06868532e0ef2edb7434af4fd3424e090998
+ 00d77a69ef4c83ede3264a5214b52bc65c5706fa5185e1371c557cc15684b2e8
+ 8224953de8e38141bb32e47d2f76ddca38d30c02e91df8f8122d879cd37300e4
+ 5915395bd9697794c015505b0c3a3b2eea5f745a8adcba71589878d93700db76
+ 46b9dff874c6d112985548f72da8c32508c61bd690c7403ddfc85fa2156657d2
+ 48373d636158147b34a8b18639339f413b718bc5185ac5b487f699598c674aee
+ 34f74360dc392e736e62ef3d121b7bed9fffc6b2196d27f57a6b136528a35d0b
+ c8161bef9de35a5b3a976f50ec6b10767614768b97137174dee4b3d151e9a305
+ b7dc7748700175786f7035608fa0eb04eae7dfe32515d955f7bde11e0bae3ea1
+ 14d3bdd086fecbcc90fededf60253cae9190849ecd077e46df66a460859428a5
+ 0b8a38c915d8671638fe179a2719c15f8692700d102db373db5c1cf2a8bd0f5f
+ a8dabc3940132c08a04017450720b257fd3f27ae3d1ea45a9d0eec1353212697
+ 33f51f9389556ce6c8b7a76024f0bc79482abe720e46133200996e927c5f4c7c
+ 06c4ad53c6ed67b495afbe8d0a684d8fe3663c8c5a09c752891a1f8d423099bd
+ a2dd11f167c2a4c4a1e034429f58c738bdc692c50f0fb33ebba3a932bb43a6cc
+ 35af53ee5ee7759cc585f357b67abdc21742c9d86a01442d961f6771097e0955
+ b7adf74ec9120aa5ca7b50a0a5226d81e4d8a31081143f6ce59f1a338ae1243f
+ ae106240d1755965de216251418afce510493b605a2af6c26de5dbc751e4f3f1
+ 9de8866f563402f80c92eabc9e654df4f007544303d0630acdadca6502e90144
+ d638039dd93a7d2de4413fb31f2262055730a8ae3bf31e6a59a7f69457eb2a35
+ d62dd2ed3c450034d1046c6b2e77ee0fefa0527b3ca9ad1c40d64914f3cd8e2f
+ c99c0f52797ef4cfa30189b7298c3f897da67d09eca63cce9bf8e3f0ca8a7bfb
+ 42f07cbec3786531f4d77878476f3cccb4313f5af5c7652007f0da8922657e03
+ b9dbffbcd7ecb2e1b2cf49632c11c05cc5616cf80b61ef6dd42207c95b3aec80
+ b5845bce6f501e7dd6e6cc37fb97de541d8c5c6457b760b6848033c863ccbda4
+ 08704f830640d156288dc0e5af77b03279b4ca82536f464518b14c5cde1671cb
+ 20ae693e61e8daefa77c24c29d4fd2347ab71297cc9b0e3b716d00446b640db7
+ c9f69c490740523e2b18205fc894c343444b8a04e1e76fa2bdce768f39f9e7ea
+ 0af926f8c33f3a6b73eaa43513737f7634c56f0673c8f0adfa9fc089d5331cc3
+ 0a0accddc498ac7b758bd0edb50f4d3ceac230f01f5c19162e1d6819589f35ba
+ b997885fe3097eaca6f23415e41150728a151459cc44fde19d663ffc217a3594
+ 263468524dee870b00cc6054b6c537d1995ede6041be6f3351b959b13de81c56
+ ab8977b2722001685de28a002b16b0054f1bab1a077c37c7b0281052eeaedc1f
+ 3261948ebaad55b46371430b42504c653340ed7218c0c7c0256f12028375bdd5
+ 83699712c49002716e474335a96b0b5e640b9e5f2d1db89c0bcfe1551fb8d0e9
+ e3d4b408a8a4a481d29089a070947e7b2693d97c1c12b5f78c6bc08ee6ab0baf
+ 83c8c34c30e6466affaa0a272adc7e75c2faa5f5179ae389525ff1aa79c4ecee
+ 96bdaeb88dbc44aa7e288eb5803775001c12b1829e91e0f0eb63b44aa774b469
+ b3dcc7700d15d5d30fe5bab74ae8e4c3467c2a22e6201eeb10a5a79138ed0075
+ 0a94c7ce16f7c0cdab3ae0b27cd8ced6875c09d7987e5e68297a1af77d64195f
+ 94518e0f9e0a2f8e9322d40ca6de2e31ad24eee98eb4beb4551b10c404973275
+ 0fe317dcad1bb745116876ff2dc72b50195c668ac88f2dd837c7ff14a35dc1de
+ 3a6e27019b697c77a3d1b031ebbe05bd0970834d9e9fd384984047001bc8306c
+ ac957380d3d87da171980516dc308b7dde903d86fa9506b409297f07825c4860
+ a7a5df97fe466fc2691d6ba2327df972c15119c78d37d418bd0211dc53285e7b
+ e41f529f5fa62c2048cdffd0a671e987f51b62e9978ca50d01d78ced4212dca8
+ 765e962f4fbc2addcd3a9487de5521358bf5802d92621654b93d510023123eb9
+ 0b31e67f55d6f470fa80572678ed6be1700bbe159ca4835faf693a510e1b089c
+ f5b3f23b8894f6f1268b04d3ce748f6ba0a7f5a56e9a10cac9c8ea840fe6148a
+ cf15d22f75c77738cd6ba0163ba91d896781ba4ac1e4fd2c1e75d097d458aa12
+ 1d8f651cefbbc736af1cd4493eee08159eafeb03ec1fad09e3fd63ca4989afc0
+ e45d53f2ab6cc43b4ce084d2a53bd73e4bb56b636936a42c3288ac3b75856c66
+ bfecd3e86df2249757a6ea1b14c9ea73384a813f1650a022a95547eaa5e78432
+ bbe62efc388950f5a66042f6fb6e075a7920f1a1ed690a705551bee60ff17af4
+ a0125e034dd9a495edfd8bf829d057f1a0d5011d1d86fa63ace6339ec5f0ec17"

From 6b1522402b0d0d4268b9819296547d337a688711 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 16:05:17 +0100
Subject: [PATCH 0088/3595] gcc-multilib: enable PIE and SSP.

Don't diverge from features of main gcc package.
---
 srcpkgs/gcc-multilib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 405c8aae769..6d2240d055e 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -5,7 +5,7 @@ _majorver=9.3
 
 pkgname=gcc-multilib
 version=${_majorver}.0
-revision=1
+revision=2
 wrksrc="gcc-${version}"
 short_desc="GNU Compiler Collection (multilib files)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -55,6 +55,8 @@ do_configure() {
 		--enable-lto \
 		--enable-linker-build-id \
 		--enable-gnu-unique-object \
+		--enable-default-pie \
+		--enable-default-ssp \
 		--enable-checking=release \
 		--disable-libstdcxx-pch \
 		--disable-target-libiberty \

From 6be57de9033ce23b7de9da74b6dad371a037f7c1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 19 Nov 2020 18:56:48 +0100
Subject: [PATCH 0089/3595] linux5.4: update to 5.4.78.

---
 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 ac8a96a98c9..60bc042af22 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.77
+version=5.4.78
 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=a3e03e6970240dddc8174bf9f49b56d774c40125eabe1582d2ebe85b01addbf7
+checksum=46886a21f44c80d9b5e4427d48cb5f23508120fe0eabee6efad9c9c4819c1a7d
 python_version=3
 patch_args="-Np1"
 

From 70f168fb3e1ed95378486280737537c028e342fe Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 19 Nov 2020 18:57:56 +0100
Subject: [PATCH 0090/3595] linux4.19: update to 4.19.158.

---
 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 28b44fd1c3b..59b6b355ae0 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.157
+version=4.19.158
 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=76dca365255c1a13778c3b24f0eae14f4e66bc12fe79f5e6592b116fc57ef755
+checksum=d658e4b13f796a370da27c868c69c2d6f6edf7eab4cda0c2b44cb31f538db75c
 python_version=2 #unverified
 patch_args="-Np1"
 

From f619a7b54ad616d1852e8c93bc852c36f218581f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 17 Nov 2020 22:28:47 +0100
Subject: [PATCH 0091/3595] giada: update to 0.17.0.

---
 srcpkgs/giada/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template
index 83d1aab438e..558097e3a0e 100644
--- a/srcpkgs/giada/template
+++ b/srcpkgs/giada/template
@@ -1,10 +1,10 @@
 # Template file for 'giada'
 pkgname=giada
-version=0.16.4
+version=0.17.0
 revision=1
-build_style=gnu-configure
-configure_args="--target=linux"
-hostmakedepends="automake"
+build_style=cmake
+# configure_args="--target=linux"
+hostmakedepends="cmake"
 makedepends="fltk-devel jack-devel libsamplerate-devel
  libsndfile-devel libXpm-devel pulseaudio-devel rtmidi-devel libXcursor-devel
  json-c++"
@@ -12,8 +12,9 @@ short_desc="Loop machine, audio tool for DJs, live performers and musicians"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://www.giadamusic.com/"
+changelog="https://github.com/monocasual/giada/raw/master/ChangeLog"
 distfiles="https://github.com/monocasual/giada/archive/v${version}.tar.gz"
-checksum=a425151ff571d4b0e79a3faaa6dd872c8f2693ffcada975b282365c865130b38
+checksum=b879f5ba7e9f34d7422aedd89d1d0baa91387b3528e057b4df25e1f2f8d661ef
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -21,7 +22,7 @@ fi
 
 post_extract() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		vsed -e 's/\($(ldAdd)\)/\1 -latomic/g' -i Makefile.am
+		vsed -e '/list(APPEND LIBRARIES)/a list(APPEND LIBRARIES atomic)' -i CMakeLists.txt
 	fi
 	vsed -e 's;deps/json/single_include/\(nlohmann/json.hpp\);\1;' -i \
 		src/core/init.cpp \
@@ -30,6 +31,6 @@ post_extract() {
 		src/core/patch.cpp
 }
 
-pre_configure() {
-	autoreconf -fi
+do_install() {
+	vbin build/giada
 }

From ef7e2582a2caada5764425abadae525e0582404c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 19 Nov 2020 23:52:39 +0100
Subject: [PATCH 0092/3595] flatpak: update to 1.8.3.

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

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 6dd4ec1e6bb..98538dbb116 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.8.2
+version=1.8.3
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -14,14 +14,14 @@ hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
 makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel
  libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel"
 depends="bubblewrap gnupg2"
-checkdepends="bubblewrap dbus"
+checkdepends="bubblewrap dbus socat which"
 short_desc="Application sandboxing and distribution framework"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
-changelog="https://github.com/flatpak/flatpak/blob/master/NEWS"
+changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=7926625df7c2282a5ee1a8b3c317af53d40a663b1bc6b18a2dc8747e265085b0
+checksum=33667fdd5cf65914209488bf3e7e574ddb57667bb7939863b4fcb40ca8b66edd
 
 build_options="gir"
 build_options_default="gir"

From 14af29e16979e31ccb566fab1ea0634123bd79d3 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Tue, 22 Sep 2020 18:36:38 -0400
Subject: [PATCH 0093/3595] xdg-desktop-portal: update to 1.8.0

---
 .../patches/pipewire-0.3.patch                | 551 ------------------
 srcpkgs/xdg-desktop-portal/template           |  19 +-
 2 files changed, 11 insertions(+), 559 deletions(-)
 delete mode 100644 srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch

diff --git a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch b/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
deleted file mode 100644
index 94ebe083598..00000000000
--- a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-From a38901e5e7f835efe7b7a06c55790c8c20bc91a2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 14 Jan 2020 09:37:09 +0100
-Subject: [PATCH] PipeWire: update to 0.3 API
-
----
- configure.ac      |   2 +-
- src/camera.c      |  24 ++++----
- src/pipewire.c    | 141 +++++++++++++---------------------------------
- src/pipewire.h    |  10 ++--
- src/screen-cast.c |  98 ++++++--------------------------
- 5 files changed, 72 insertions(+), 203 deletions(-)
-
-diff --git configure.ac configure.ac
-index 89902fa..62d7960 100644
---- configure.ac
-+++ configure.ac
-@@ -97,7 +97,7 @@ AC_ARG_ENABLE(pipewire,
- 	      [AS_HELP_STRING([--enable-pipewire],[Enable PipeWire support. Needed for screen cast portal])],
- 	      enable_pipewire=$enableval, enable_pipewire=yes)
- if test x$enable_pipewire = xyes ; then
--	PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.2 >= 0.2.6])
-+	PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.3 >= 0.2.90])
- 	AC_DEFINE([HAVE_PIPEWIRE],[1], [Define to enable PipeWire support])
- fi
- AM_CONDITIONAL([HAVE_PIPEWIRE],[test "$enable_pipewire" = "yes"])
-diff --git src/camera.c src/camera.c
-index c2b392c..20fe3aa 100644
---- src/camera.c
-+++ src/camera.c
-@@ -141,7 +141,7 @@ open_pipewire_camera_remote (const char *app_id,
-                              GError **error)
- {
-   PipeWireRemote *remote;
--  struct spa_dict_item permission_items[1];
-+  struct pw_permission permission_items[2];
-   struct pw_properties *pipewire_properties;
- 
-   pipewire_properties =
-@@ -158,12 +158,12 @@ open_pipewire_camera_remote (const char *app_id,
-    * Hide all existing and future nodes by default. PipeWire will use the
-    * permission store to set up permissions.
-    */
--  permission_items[0].key = PW_CORE_PROXY_PERMISSIONS_DEFAULT;
--  permission_items[0].value = "---";
-+  permission_items[0] = PW_PERMISSION_INIT (PW_ID_CORE, PW_PERM_RWX);
-+  permission_items[1] = PW_PERMISSION_INIT (PW_ID_ANY, 0);
- 
--  pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote),
--                             &SPA_DICT_INIT (permission_items,
--                                             G_N_ELEMENTS (permission_items)));
-+  pw_client_update_permissions (pw_core_get_client(remote->core),
-+                                G_N_ELEMENTS (permission_items),
-+                                permission_items);
- 
-   pipewire_remote_roundtrip (remote);
- 
-@@ -219,7 +219,7 @@ handle_open_pipewire_remote (XdpCamera *object,
-     }
- 
-   out_fd_list = g_unix_fd_list_new ();
--  fd = pw_remote_steal_fd (remote->remote);
-+  fd = pw_core_steal_fd (remote->core);
-   fd_id = g_unix_fd_list_append (out_fd_list, fd, &error);
-   close (fd);
-   pipewire_remote_destroy (remote);
-@@ -250,29 +250,28 @@ camera_iface_init (XdpCameraIface *iface)
- static void
- global_added_cb (PipeWireRemote *remote,
-                  uint32_t id,
--                 uint32_t type,
-+                 const char *type,
-                  const struct spa_dict *props,
-                  gpointer user_data)
- {
-   Camera *camera = user_data;
--  struct pw_type *core_type = pw_core_get_type (remote->core);
-   const struct spa_dict_item *media_class;
-   const struct spa_dict_item *media_role;
- 
--  if (type != core_type->node)
-+  if (strcmp(type, PW_TYPE_INTERFACE_Node) != 0)
-     return;
- 
-   if (!props)
-     return;
- 
--  media_class = spa_dict_lookup_item (props, "media.class");
-+  media_class = spa_dict_lookup_item (props, PW_KEY_MEDIA_CLASS);
-   if (!media_class)
-     return;
- 
-   if (g_strcmp0 (media_class->value, "Video/Source") != 0)
-     return;
- 
--  media_role = spa_dict_lookup_item (props, "media.role");
-+  media_role = spa_dict_lookup_item (props, PW_KEY_MEDIA_ROLE);
-   if (!media_role)
-     return;
- 
-@@ -342,6 +341,7 @@ create_pipewire_remote (Camera *camera,
-     }
- 
-   pipewire_properties = pw_properties_new ("pipewire.access.portal.is_portal", "true",
-+                                           "portal.monitor", "Camera",
-                                            NULL);
-   camera->pipewire_remote = pipewire_remote_new_sync (pipewire_properties,
-                                                       global_added_cb,
-diff --git src/pipewire.c src/pipewire.c
-index 793a378..162cd55 100644
---- src/pipewire.c
-+++ src/pipewire.c
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <glib.h>
- #include <pipewire/pipewire.h>
-+#include <spa/utils/result.h>
- 
- #include "pipewire.h"
- 
-@@ -36,27 +37,25 @@ static gboolean is_pipewire_initialized = FALSE;
- static void
- registry_event_global (void *user_data,
-                        uint32_t id,
--                       uint32_t parent_id,
-                        uint32_t permissions,
--                       uint32_t type,
-+                       const char *type,
-                        uint32_t version,
-                        const struct spa_dict *props)
- {
-   PipeWireRemote *remote = user_data;
--  struct pw_type *core_type = pw_core_get_type (remote->core);
-   const struct spa_dict_item *factory_object_type;
-   PipeWireGlobal *global;
- 
-   global = g_new0 (PipeWireGlobal, 1);
-   *global = (PipeWireGlobal) {
--    .parent_id = parent_id,
-+    .parent_id = id,
-   };
- 
-   g_hash_table_insert (remote->globals, GINT_TO_POINTER (id), global);
-   if (remote->global_added_cb)
-     remote->global_added_cb (remote, id, type, props, remote->user_data);
- 
--  if (type != core_type->factory)
-+  if (strcmp(type, PW_TYPE_INTERFACE_Factory) != 0)
-     return;
- 
-   factory_object_type = spa_dict_lookup_item (props, "factory.type.name");
-@@ -81,8 +80,8 @@ registry_event_global_remove (void *user_data,
-   g_hash_table_remove (remote->globals, GINT_TO_POINTER (id));
- }
- 
--static const struct pw_registry_proxy_events registry_events = {
--  PW_VERSION_REGISTRY_PROXY_EVENTS,
-+static const struct pw_registry_events registry_events = {
-+  PW_VERSION_REGISTRY_EVENTS,
-   .global = registry_event_global,
-   .global_remove = registry_event_global_remove,
- };
-@@ -90,7 +89,7 @@ static const struct pw_registry_proxy_events registry_events = {
- void
- pipewire_remote_roundtrip (PipeWireRemote *remote)
- {
--  pw_core_proxy_sync (remote->core_proxy, ++remote->sync_seq);
-+  remote->sync_seq = pw_core_sync (remote->core, PW_ID_CORE, remote->sync_seq);
-   pw_main_loop_run (remote->loop);
- }
- 
-@@ -98,16 +97,13 @@ static gboolean
- discover_node_factory_sync (PipeWireRemote *remote,
-                             GError **error)
- {
--  struct pw_type *core_type = pw_core_get_type (remote->core);
--  struct pw_registry_proxy *registry_proxy;
-+  struct pw_registry *registry;
- 
--  registry_proxy = pw_core_proxy_get_registry (remote->core_proxy,
--                                               core_type->registry,
--                                               PW_VERSION_REGISTRY, 0);
--  pw_registry_proxy_add_listener (registry_proxy,
--                                  &remote->registry_listener,
--                                  &registry_events,
--                                  remote);
-+  registry = pw_core_get_registry (remote->core, PW_VERSION_REGISTRY, 0);
-+  pw_registry_add_listener (registry,
-+                            &remote->registry_listener,
-+                            &registry_events,
-+                            remote);
- 
-   pipewire_remote_roundtrip (remote);
- 
-@@ -122,59 +118,35 @@ discover_node_factory_sync (PipeWireRemote *remote,
- }
- 
- static void
--on_state_changed (void *user_data,
--                  enum pw_remote_state old,
--                  enum pw_remote_state state,
--                  const char *error)
-+core_event_error (void       *user_data,
-+                  uint32_t    id,
-+		  int         seq,
-+		  int         res,
-+		  const char *message)
- {
-   PipeWireRemote *remote = user_data;
- 
--  switch (state)
-+  if (id == PW_ID_CORE)
-     {
--    case PW_REMOTE_STATE_ERROR:
--      if (!remote->error)
--        {
--          g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                       "%s", error);
--        }
-+      g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+                 "%s", message);
-       pw_main_loop_quit (remote->loop);
--      break;
--    case PW_REMOTE_STATE_UNCONNECTED:
--      if (!remote->error)
--        {
--          g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                       "Disconnected");
--        }
--      pw_main_loop_quit (remote->loop);
--      break;
--    case PW_REMOTE_STATE_CONNECTING:
--      break;
--    case PW_REMOTE_STATE_CONNECTED:
--      pw_main_loop_quit (remote->loop);
--      break;
--    default:
--      g_warning ("Unknown PipeWire state");
--      break;
-     }
- }
- 
--static const struct pw_remote_events remote_events = {
--  PW_VERSION_REMOTE_EVENTS,
--  .state_changed = on_state_changed,
--};
--
- static void
- core_event_done (void *user_data,
--                 uint32_t seq)
-+                 uint32_t id, int seq)
- {
-   PipeWireRemote *remote = user_data;
- 
--  if (remote->sync_seq == seq)
-+  if (id == PW_ID_CORE && remote->sync_seq == seq)
-     pw_main_loop_quit (remote->loop);
- }
- 
--static const struct pw_core_proxy_events core_events = {
--  PW_VERSION_CORE_PROXY_EVENTS,
-+static const struct pw_core_events core_events = {
-+  PW_VERSION_CORE_EVENTS,
-+  .error = core_event_error,
-   .done = core_event_done,
- };
- 
-@@ -237,8 +209,8 @@ void
- pipewire_remote_destroy (PipeWireRemote *remote)
- {
-   g_clear_pointer (&remote->globals, g_hash_table_destroy);
--  g_clear_pointer (&remote->remote, pw_remote_destroy);
--  g_clear_pointer (&remote->core, pw_core_destroy);
-+  g_clear_pointer (&remote->core, pw_core_disconnect);
-+  g_clear_pointer (&remote->context, pw_context_destroy);
-   g_clear_pointer (&remote->loop, pw_main_loop_destroy);
-   g_clear_error (&remote->error);
- 
-@@ -307,68 +279,31 @@ pipewire_remote_new_sync (struct pw_properties *pipewire_properties,
-       return NULL;
-     }
- 
--  remote->core = pw_core_new (pw_main_loop_get_loop (remote->loop), NULL);
--  if (!remote->core)
-+  remote->context = pw_context_new (pw_main_loop_get_loop (remote->loop), NULL, 0);
-+  if (!remote->context)
-     {
-       pipewire_remote_destroy (remote);
-       pw_properties_free (pipewire_properties);
-       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   "Couldn't create PipeWire core");
-+                   "Couldn't create PipeWire context");
-       return NULL;
-     }
- 
--  remote->remote = pw_remote_new (remote->core, pipewire_properties, 0);
--  if (!remote->remote)
-+  remote->core = pw_context_connect (remote->context, pipewire_properties, 0);
-+  if (!remote->core)
-     {
-       pipewire_remote_destroy (remote);
-       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   "Couldn't create PipeWire remote");
-+                   "Couldn't connect to PipeWire");
-       return NULL;
-     }
- 
-   remote->globals = g_hash_table_new_full (NULL, NULL, NULL, g_free);
- 
--  pw_remote_add_listener (remote->remote,
--                          &remote->remote_listener,
--                          &remote_events,
--                          remote);
--
--  if (pw_remote_connect (remote->remote) != 0)
--    {
--      pipewire_remote_destroy (remote);
--      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   "Couldn't connect PipeWire remote");
--      return NULL;
--    }
--
--  pw_main_loop_run (remote->loop);
--
--  switch (pw_remote_get_state (remote->remote, NULL))
--    {
--    case PW_REMOTE_STATE_ERROR:
--    case PW_REMOTE_STATE_UNCONNECTED:
--      *error = g_steal_pointer (&remote->error);
--      pipewire_remote_destroy (remote);
--      return NULL;
--    case PW_REMOTE_STATE_CONNECTING:
--      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   "PipeWire loop stopped unexpectedly");
--      pipewire_remote_destroy (remote);
--      return NULL;
--    case PW_REMOTE_STATE_CONNECTED:
--      break;
--    default:
--      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   "Unexpected PipeWire state");
--      pipewire_remote_destroy (remote);
--      return NULL;
--    }
--
--  remote->core_proxy = pw_remote_get_core_proxy (remote->remote);
--  pw_core_proxy_add_listener (remote->core_proxy,
--                              &remote->core_listener,
--                              &core_events,
--                              remote);
-+  pw_core_add_listener (remote->core,
-+                        &remote->core_listener,
-+                        &core_events,
-+                        remote);
- 
-   if (!discover_node_factory_sync (remote, error))
-     {
-diff --git src/pipewire.h src/pipewire.h
-index 0f1bf54..bf48d5e 100644
---- src/pipewire.h
-+++ src/pipewire.h
-@@ -32,7 +32,7 @@ typedef struct _PipeWireGlobal
- 
- typedef void (* PipeWireGlobalAddedCallback) (PipeWireRemote *remote,
-                                               uint32_t id,
--                                              uint32_t type,
-+                                              const char *type,
-                                               const struct spa_dict *props,
-                                               gpointer user_data);
- 
-@@ -43,13 +43,11 @@ typedef void (* PipeWireGlobalRemovedCallback) (PipeWireRemote *remote,
- struct _PipeWireRemote
- {
-   struct pw_main_loop *loop;
-+  struct pw_context *context;
-   struct pw_core *core;
--  struct pw_remote *remote;
--  struct spa_hook remote_listener;
--
--  struct pw_core_proxy *core_proxy;
-   struct spa_hook core_listener;
--  uint32_t sync_seq;
-+
-+  int sync_seq;
- 
-   struct spa_hook registry_listener;
- 
-diff --git src/screen-cast.c src/screen-cast.c
-index 7881ddc..1677050 100644
---- src/screen-cast.c
-+++ src/screen-cast.c
-@@ -31,10 +31,10 @@
- #include "xdp-impl-dbus.h"
- #include "xdp-utils.h"
- 
--#define PERMISSION_ITEM(item_key, item_value) \
--  ((struct spa_dict_item) { \
--    .key = item_key, \
--    .value = item_value \
-+#define PERMISSION_ITEM(item_id, item_permissions) \
-+  ((struct pw_permission) { \
-+    .id = item_id, \
-+    .permissions = item_permissions \
-   })
- 
- typedef struct _ScreenCast ScreenCast;
-@@ -517,42 +517,9 @@ screen_cast_stream_get_pipewire_node_id (ScreenCastStream *stream)
-   return stream->id;
- }
- 
--static void
--append_parent_permissions (PipeWireRemote *remote,
--                           GArray *permission_items,
--                           GList **string_stash,
--                           PipeWireGlobal *global,
--                           const char *permission)
--{
--  PipeWireGlobal *parent;
--  char *parent_permission_value;
--
--  if (global->parent_id == 0)
--    return;
--
--  parent = g_hash_table_lookup (remote->globals, GINT_TO_POINTER (global->parent_id));
--
--  if (parent->permission_set)
--    return;
--  parent->permission_set = TRUE;
--
--  append_parent_permissions (remote, permission_items, string_stash,
--                             parent, permission);
--
--  parent_permission_value = g_strdup_printf ("%u:%s",
--                                             global->parent_id,
--                                             permission);
--  *string_stash = g_list_prepend (*string_stash, parent_permission_value);
--
--  g_array_append_val (permission_items,
--                      PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
--                                       parent_permission_value));
--}
--
- static void
- append_stream_permissions (PipeWireRemote *remote,
-                            GArray *permission_items,
--                           GList **string_stash,
-                            GList *streams)
- {
-   GList *l;
-@@ -561,21 +528,10 @@ append_stream_permissions (PipeWireRemote *remote,
-     {
-       ScreenCastStream *stream = l->data;
-       uint32_t stream_id;
--      PipeWireGlobal *stream_global;
--      char *stream_permission_value;
- 
-       stream_id = screen_cast_stream_get_pipewire_node_id (stream);
--      stream_global = g_hash_table_lookup (remote->globals,
--                                           GINT_TO_POINTER (stream_id));
--
--      append_parent_permissions (remote, permission_items, string_stash,
--                                 stream_global, "r--");
--
--      stream_permission_value = g_strdup_printf ("%u:rwx", stream_id);
--      *string_stash = g_list_prepend (*string_stash, stream_permission_value);
-       g_array_append_val (permission_items,
--                          PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
--                                           stream_permission_value));
-+                          PERMISSION_ITEM (stream_id, PW_PERM_RWX));
-     }
- }
- 
-@@ -587,9 +543,6 @@ open_pipewire_screen_cast_remote (const char *app_id,
-   struct pw_properties *pipewire_properties;
-   PipeWireRemote *remote;
-   g_autoptr(GArray) permission_items = NULL;
--  char *node_factory_permission_string;
--  GList *string_stash = NULL;
--  struct spa_dict *permission_dict;
-   PipeWireGlobal *node_global;
- 
-   pipewire_properties = pw_properties_new ("pipewire.access.portal.app_id", app_id,
-@@ -603,48 +556,31 @@ open_pipewire_screen_cast_remote (const char *app_id,
- 
-   permission_items = g_array_new (FALSE, TRUE, sizeof (struct spa_dict_item));
- 
--  /*
--   * Hide all existing and future nodes (except the ones we explicitly list below.
--   */
--  g_array_append_val (permission_items,
--                      PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_EXISTING,
--                                       "---"));
--  g_array_append_val (permission_items,
--                      PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_DEFAULT,
--                                       "---"));
--
-   /*
-    * PipeWire:Interface:Core
-    * Needs rwx to be able create the sink node using the create-object method
-    */
-   g_array_append_val (permission_items,
--                      PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
--                                       "0:rwx"));
-+                      PERMISSION_ITEM (PW_ID_CORE, PW_PERM_RWX));
- 
-   /*
-    * PipeWire:Interface:NodeFactory
-    * Needs r-- so it can be passed to create-object when creating the sink node.
-    */
--  node_factory_permission_string = g_strdup_printf ("%d:r--",
--                                                    remote->node_factory_id);
--  string_stash = g_list_prepend (string_stash, node_factory_permission_string);
-   g_array_append_val (permission_items,
--                      PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL,
--                                       node_factory_permission_string));
--  node_global = g_hash_table_lookup (remote->globals,
--                                     GINT_TO_POINTER (remote->node_factory_id));
--  append_parent_permissions (remote, permission_items, &string_stash,
--                             node_global, "r--");
-+                      PERMISSION_ITEM (remote->node_factory_id, PW_PERM_R));
- 
--  append_stream_permissions (remote, permission_items, &string_stash, streams);
-+  append_stream_permissions (remote, permission_items, streams);
- 
--  permission_dict =
--    &SPA_DICT_INIT ((struct spa_dict_item *) permission_items->data,
--                    permission_items->len);
--  pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote),
--                             permission_dict);
-+  /*
-+   * Hide all existing and future nodes (except the ones we explicitly list above).
-+   */
-+  g_array_append_val (permission_items,
-+                      PERMISSION_ITEM (PW_ID_ANY, 0));
- 
--  g_list_free_full (string_stash, g_free);
-+  pw_client_update_permissions (pw_core_get_client(remote->core),
-+                                permission_items->len,
-+                                (const struct pw_permission *)permission_items->data);
- 
-   pipewire_remote_roundtrip (remote);
- 
-@@ -943,7 +879,7 @@ handle_open_pipewire_remote (XdpScreenCast *object,
-     }
- 
-   out_fd_list = g_unix_fd_list_new ();
--  fd = pw_remote_steal_fd (remote->remote);
-+  fd = pw_core_steal_fd (remote->core);
-   fd_id = g_unix_fd_list_append (out_fd_list, fd, &error);
-   close (fd);
-   pipewire_remote_destroy (remote);
diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 1136b6a6e0e..b2b9d77727b 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,20 +1,23 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.6.0
-revision=2
+version=1.8.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --disable-libportal"
-hostmakedepends="automake libtool gettext-devel pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+hostmakedepends="pkg-config glib-devel"
+makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+ libportal-devel"
+checkdepends="dbus"
 short_desc="Portal frontend service for Flatpak"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=883c9c9a925e48af54812b5347f546dd776ec2e27076a83d5a8126af6bafb9da
+checksum=a2fc5681b3a35078239072a98d6435a4c8404016730cab17c9febfd4ecec3610
 
-pre_configure() {
-	autoreconf -vfi
+do_check() {
+	# some tests require a dbus session
+	make check || :
 }
 
 post_install() {

From f3f61c7a24ff2b20c5d4b32fd6c7d258e9c32269 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <reg@reginaldtiangha.com>
Date: Thu, 19 Nov 2020 11:32:05 -0700
Subject: [PATCH 0094/3595] slack-desktop: update to 4.11.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 7624d15a5eb..482e2ff2a89 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.11.0
+version=4.11.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=ecfe313c75ceb01c8f142a90efa728a1009b5ade1bd7dd74b84fd05102ebccbe
+checksum=cf549741b6477cca74be04e56b96a8a9bfb02452ebd641d1c0aa286afb7883e4
 restricted=yes
 repository="nonfree"
 nopie=yes

From ba24837905cea117883ab426793392b774d47477 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 00:55:59 +0100
Subject: [PATCH 0095/3595] musl: add patch for CVE-2020-28928

---
 srcpkgs/musl/patches/CVE-2020-28928.patch | 64 +++++++++++++++++++++++
 srcpkgs/musl/template                     |  2 +-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/CVE-2020-28928.patch

diff --git a/srcpkgs/musl/patches/CVE-2020-28928.patch b/srcpkgs/musl/patches/CVE-2020-28928.patch
new file mode 100644
index 00000000000..9075ae1f897
--- /dev/null
+++ b/srcpkgs/musl/patches/CVE-2020-28928.patch
@@ -0,0 +1,64 @@
+--- src/multibyte/wcsnrtombs.c
++++ src/multibyte/wcsnrtombs.c
+@@ -1,41 +1,33 @@
+ #include <wchar.h>
++#include <limits.h>
++#include <string.h>
+ 
+ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st)
+ {
+-	size_t l, cnt=0, n2;
+-	char *s, buf[256];
+ 	const wchar_t *ws = *wcs;
+-	const wchar_t *tmp_ws;
+-
+-	if (!dst) s = buf, n = sizeof buf;
+-	else s = dst;
+-
+-	while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
+-		if (n2>=n) n2=n;
+-		tmp_ws = ws;
+-		l = wcsrtombs(s, &ws, n2, 0);
+-		if (!(l+1)) {
+-			cnt = l;
+-			n = 0;
++	size_t cnt = 0;
++	if (!dst) n=0;
++	while (ws && wn) {
++		char tmp[MB_LEN_MAX];
++		size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0);
++		if (l==-1) {
++			cnt = -1;
+ 			break;
+ 		}
+-		if (s != buf) {
+-			s += l;
++		if (dst) {
++			if (n<MB_LEN_MAX) {
++				if (l>n) break;
++				memcpy(dst, tmp, l);
++			}
++			dst += l;
+ 			n -= l;
+ 		}
+-		wn = ws ? wn - (ws - tmp_ws) : 0;
+-		cnt += l;
+-	}
+-	if (ws) while (n && wn) {
+-		l = wcrtomb(s, *ws, 0);
+-		if ((l+1)<=1) {
+-			if (!l) ws = 0;
+-			else cnt = l;
++		if (!*ws) {
++			ws = 0;
+ 			break;
+ 		}
+-		ws++; wn--;
+-		/* safe - this loop runs fewer than sizeof(buf) times */
+-		s+=l; n-=l;
++		ws++;
++		wn--;
+ 		cnt += l;
+ 	}
+ 	if (dst) *wcs = ws;
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 6a0ac60b03c..a08ef9e0d89 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=4
+revision=5
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From 16603afcc48cec7032a8f4841a3e5bb251fc2044 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 00:59:15 +0100
Subject: [PATCH 0096/3595] musl-bootstrap: rebuild with patches including
 CVE-2020-28928

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

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 67cc82e1474..6f0e1b1ef68 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'musl-bootstrap'.
 pkgname=musl-bootstrap
 version=1.1.24
-revision=1
+revision=2
 lib32disabled=yes
 wrksrc="musl-${version}"
 build_style=configure

From e9e1bd9fec9303e781da2f5fb6fed1c4de842b3d Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 19 Nov 2020 08:06:02 -0500
Subject: [PATCH 0097/3595] chromium: update to 87.0.4280.66.

[ci skip]

- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.
---
 .../files/musl-patches/no-mallinfo.patch      |  10 +-
 .../patches/chromium-86-nearby-include.patch  |  24 ---
 .../chromium-87-CursorFactory-include.patch   |  36 +++++
 ...-87-ServiceWorkerContainerHost-crash.patch |  22 +++
 .../chromium-87-openscreen-include.patch      |  25 ++++
 ...remove-unsupported-compiler-warnings.patch |  22 +--
 ...le-accelerated-video-decode-on-Linux.patch |  43 ------
 ...-end-iterator-usage-in-CookieMonster.patch |  78 ----------
 ...k-to-the-i965-driver-if-we-re-on-iHD.patch | 139 ------------------
 ...move-dead-reloc-in-nonalloc-LD-flags.patch |  37 -----
 ...roto-fix-underflow-in-Fp1616ToDouble.patch |  37 -----
 .../chromium/patches/xxx-ppc64le-libvpx.patch |   9 --
 .../patches/xxx-ppc64le-support.patch         |  26 ++--
 srcpkgs/chromium/template                     |   4 +-
 14 files changed, 104 insertions(+), 408 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-86-nearby-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
 delete mode 100644 srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
 delete mode 100644 srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
 delete mode 100644 srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
 delete mode 100644 srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
 delete mode 100644 srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch

diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 61d5d7a77ca..254a1f632da 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -9,14 +9,14 @@
    struct mallinfo info = mallinfo();
    DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
  
---- base/process/process_metrics_posix.cc.orig	2019-10-24 11:10:48.553159245 -0400
-+++ base/process/process_metrics_posix.cc	2019-10-24 11:14:29.025025854 -0400
-@@ -110,14 +110,14 @@
+--- base/process/process_metrics_posix.cc.orig	2020-11-18 23:50:33.958223497 -0500
++++ base/process/process_metrics_posix.cc	2020-11-18 23:53:52.024589316 -0500
+@@ -119,14 +119,14 @@
    malloc_statistics_t stats = {0};
    malloc_zone_statistics(nullptr, &stats);
    return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
    struct mallinfo minfo = mallinfo();
  #if BUILDFLAG(USE_TCMALLOC)
    return minfo.uordblks;
diff --git a/srcpkgs/chromium/patches/chromium-86-nearby-include.patch b/srcpkgs/chromium/patches/chromium-86-nearby-include.patch
deleted file mode 100644
index b200a7ebd96..00000000000
--- a/srcpkgs/chromium/patches/chromium-86-nearby-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a5b2ee9dd7dfb186e26ec6c0c06c2ae1a9d27195 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 18 Jul 2020 14:15:50 +0000
-Subject: [PATCH] IWYU: memcpy is defined in cstring
-
----
- third_party/nearby/src/cpp/platform_v2/base/byte_array.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/nearby/src/cpp/platform_v2/base/byte_array.h b/third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-index ee5d0eb..4b1d79b 100644
---- third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-+++ third_party/nearby/src/cpp/platform_v2/base/byte_array.h
-@@ -17,6 +17,7 @@
- 
- #include <array>
- #include <cstdint>
-+#include <cstring>
- #include <string>
- #include <type_traits>
- #include <utility>
--- 
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
new file mode 100644
index 00000000000..d345e584830
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
@@ -0,0 +1,36 @@
+From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 16 Sep 2020 15:05:02 +0000
+Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
+ Ozone
+
+---
+ .../ui/views/chrome_browser_main_extra_parts_views_linux.cc  | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+index 5a97d61..ccedd2a 100644
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
++++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+@@ -7,6 +7,7 @@
+ #include "chrome/browser/themes/theme_service_aura_linux.h"
+ #include "chrome/browser/ui/browser_list.h"
+ #include "chrome/browser/ui/views/theme_profile_key.h"
++#include "ui/base/cursor/cursor_factory.h"
+ #include "ui/display/screen.h"
+ #include "ui/views/linux_ui/linux_ui.h"
+ 
+@@ -15,10 +16,6 @@
+ #include "ui/gtk/gtk_ui_delegate.h"
+ #endif
+ 
+-#if defined(USE_OZONE)
+-#include "ui/base/cursor/cursor_factory.h"
+-#endif
+-
+ #if defined(USE_X11)
+ #include "ui/gfx/x/connection.h"  // nogncheck
+ #if BUILDFLAG(USE_GTK)
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
new file mode 100644
index 00000000000..286b86691f1
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/750038
+Upstream bug: https://crbug.com/1135070
+
+--- content/browser/service_worker/service_worker_container_host.cc
++++ content/browser/service_worker/service_worker_container_host.cc
+@@ -626,6 +626,16 @@
+     int64_t registration_id) {
+   DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
+   DCHECK(base::Contains(registration_object_hosts_, registration_id));
++
++  // ServiceWorkerRegistrationObjectHost to be deleted may have the last reference to
++  // ServiceWorkerRegistration that indirectly owns this ServiceWorkerContainerHost.
++  // If we erase the object host directly from the map, |this| could be deleted
++  // during the map operation and may crash. To avoid the case, we take the
++  // ownership of the object host from the map first, and then erase the entry
++  // from the map. See https://crbug.com/1135070 for details.
++  std::unique_ptr<ServiceWorkerRegistrationObjectHost> to_be_deleted =
++      std::move(registration_object_hosts_[registration_id]);
++  DCHECK(to_be_deleted);
+   registration_object_hosts_.erase(registration_id);
+ }
+ 
diff --git a/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
new file mode 100644
index 00000000000..03ae0e9eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
@@ -0,0 +1,25 @@
+From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 2 Oct 2020 12:11:58 +0000
+Subject: [PATCH] IWYU: uint8_t is defined in stdint.h
+
+---
+ third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
+index 3cb2fa8..025b52c 100644
+--- third_party/openscreen/src/util/crypto/random_bytes.h
++++ third_party/openscreen/src/util/crypto/random_bytes.h
+@@ -7,6 +7,8 @@
+ 
+ #include <array>
+ 
++#include <stdint.h>
++
+ namespace openscreen {
+ 
+ std::array<uint8_t, 16> GenerateRandomBytes16();
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
index 86a6e2d8fd7..4286b16b13f 100644
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
@@ -1,28 +1,12 @@
---- build/config/compiler/BUILD.gn.orig	2020-10-09 11:20:12.892910174 -0400
-+++ build/config/compiler/BUILD.gn	2020-10-09 11:59:20.403349122 -0400
-@@ -1518,12 +1518,6 @@
-         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
-         # recognize.
-         cflags += [
--          # An ABI compat warning we don't care about, https://crbug.com/1102157
--          # TODO(thakis): Push this to the (few) targets that need it,
--          # instead of having a global flag.
--          "-Wno-psabi",
--
--          # Ignore warnings about MSVC optimization pragmas.
-           # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
-           "-Wno-ignored-pragma-optimize",
- 
-@@ -1538,25 +1532,12 @@
+--- build/config/compiler/BUILD.gn.orig	2020-11-17 13:39:13.000000000 -0500
++++ build/config/compiler/BUILD.gn	2020-11-18 20:54:58.313154596 -0500
+@@ -1536,22 +1530,12 @@
  
            # TODO(https://crbug.com/1028110): Evaluate and possible enable.
            "-Wno-deprecated-copy",
 -
 -          # TODO(https://crbug.com/1050281): Clean up, enable.
 -          "-Wno-non-c-typedef-for-linkage",
--
--          # TODO(https://crbug.com/1114873): Clean up, enable.
--          "-Wno-string-concatenation",
          ]
  
          cflags_c += [
diff --git a/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch b/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
deleted file mode 100644
index e7d05e84b04..00000000000
--- a/srcpkgs/chromium/patches/upstream-check-for-enable-accelerated-video-decode-on-Linux.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 54deb9811ca9bd2327def5c05ba6987b8c7a0897 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 29 Sep 2020 01:02:22 +0000
-Subject: [PATCH] Check for enable-accelerated-video-decode on Linux
-
-Video decoding was being accelerated on Linux even though the newly
-added "enable-accelerated-video-decode" flag was not specified. The
-chrome://gpu page was misleadingly showing this feature as disabled:
-
-  > Video Decode: Software only. Hardware acceleration disabled
-
-This change adds a check for --enable-accelerated-video-decode when
-considering if video decoding should be activated. (Only on Linux.)
-
-Extra context: https://crbug.com/1097029#c18 (and also comment 20).
-
-Bug: 1066176, 1097029
-Change-Id: I534115f5f6ceed0ee3511fcf5c2d0f1dd04b9b7e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431434
-Reviewed-by: John Abd-El-Malek <jam@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#811480}
----
- content/renderer/render_thread_impl.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index f13c94ddab7..0352f127171 100644
---- content/renderer/render_thread_impl.cc
-+++ content/renderer/render_thread_impl.cc
-@@ -1121,7 +1121,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
-           kGpuStreamPriorityMedia);
- 
-   const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) &&
-+#else
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-       (gpu_channel_host->gpu_feature_info()
-            .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
-        gpu::kGpuFeatureStatusEnabled);
diff --git a/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch b/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
deleted file mode 100644
index 7494dc9b7c3..00000000000
--- a/srcpkgs/chromium/patches/upstream-fix-invalid-end-iterator-usage-in-CookieMonster.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 53478caee862624fc6d73516f8d64253854b146f Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <ptworek@vewd.com>
-Date: Mon, 31 Aug 2020 21:03:58 +0000
-Subject: [PATCH] Fix invalid "end" iterator usage in CookieMonster.
-
-Commit 229623d76e8baf714c8569c9f4efc5de266cef8b has introduced the following
-code in cookie_monster.cc.
-
-// If this is the first cookie in |cookies_| with this key, increment the
-// |num_keys_| counter.
-bool different_prev =
-    inserted == cookies_.begin() || std::prev(inserted)->first != key;
-bool different_next =
-    inserted == cookies_.end() || std::next(inserted)->first != key;
-if (different_prev && different_next)
-  ++num_keys_;
-
-The "inserted" iterator is something that has been returned from
-std::multimap::insert. At first glance it looks reasonable. The code
-tries to determine if there are already similar elements with the same
-key in the map. Unfortunately the expression calculating the value of
-different_next can potentially use the end iterator to the map. The
-"inserted == cookies_.end()" part of the expression will always evaluate
-to false since the newly inserted element has to be in the map and
-cookies_.end() points to the first element outside the map. If the
-inserted happens to be the last element in the map the second part of
-the expression will grab the end iterator by calling std::next(inserted)
-and then will try to use it leading to invalid memory access.
-
-Given the fact that cookies_ is a std::multimap we should not even need
-to calculate the value of different_next. It should always be true.
-
-  "If the container has elements with equivalent key, inserts at the
-  upper bound of that range.(since C++11)"
-
-See: https://en.cppreference.com/w/cpp/container/multimap/insert
-
-Bug: 1120240
-Change-Id: I8928c294ac4daf72349a2331b31b017c1d015da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368872
-Reviewed-by: Maksim Orlovich <morlovich@chromium.org>
-Commit-Queue: Piotr Tworek <ptworek@vewd.com>
-Cr-Commit-Position: refs/heads/master@{#803260}
----
- net/cookies/cookie_monster.cc | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
-index 265deed0e52..140b61a81dc 100644
---- net/cookies/cookie_monster.cc
-+++ net/cookies/cookie_monster.cc
-@@ -1151,9 +1151,14 @@ CookieMonster::CookieMap::iterator CookieMonster::InternalInsertCookie(
-   // |num_keys_| counter.
-   bool different_prev =
-       inserted == cookies_.begin() || std::prev(inserted)->first != key;
--  bool different_next =
--      inserted == cookies_.end() || std::next(inserted)->first != key;
--  if (different_prev && different_next)
-+  // According to std::multiqueue documentation:
-+  // "If the container has elements with equivalent key, inserts at the upper
-+  // bound of that range. (since C++11)"
-+  // This means that "inserted" iterator either points to the last element in
-+  // the map, or the element succeeding it has to have different key.
-+  DCHECK(std::next(inserted) == cookies_.end() ||
-+         std::next(inserted)->first != key);
-+  if (different_prev)
-     ++num_keys_;
- 
-   return inserted;
-@@ -1381,7 +1386,7 @@ void CookieMonster::InternalDeleteCookie(CookieMap::iterator it,
-   bool different_prev =
-       it == cookies_.begin() || std::prev(it)->first != it->first;
-   bool different_next =
--      it == cookies_.end() || std::next(it)->first != it->first;
-+      std::next(it) == cookies_.end() || std::next(it)->first != it->first;
-   if (different_prev && different_next)
-     --num_keys_;
- 
diff --git a/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch b/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
deleted file mode 100644
index 5c517e4a8eb..00000000000
--- a/srcpkgs/chromium/patches/upstream-only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From fbd756ab55f9351165f923b0411c31dd71319c78 Mon Sep 17 00:00:00 2001
-From: Ted Meyer <tmathmeyer@chromium.org>
-Date: Wed, 16 Sep 2020 17:42:03 +0000
-Subject: [PATCH] Only fall back to the i965 driver if we're on iHD
-
-I got my hands on an old AMD laptop, and the gallium driver worked very
-well and was saving power even at 720p, so there's no reason to block
-that for now.
-
-Bug: 1116703
-Change-Id: Ib15bc2b93f33e99adad7569dd825e167b503a0ea
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409967
-Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#807550}
----
- media/gpu/vaapi/vaapi_wrapper.cc | 73 ++++++++++++++++++++------------
- 1 file changed, 47 insertions(+), 26 deletions(-)
-
-diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
-index 2ad0b997e56..e30d1dfb73b 100644
---- media/gpu/vaapi/vaapi_wrapper.cc
-+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -409,6 +409,8 @@ class VADisplayState {
- 
-   // Implementation of Initialize() called only once.
-   bool InitializeOnce() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-+  bool InitializeVaDisplay_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
-+  bool InitializeVaDriver_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
- 
-   int refcount_ GUARDED_BY(va_lock_);
- 
-@@ -472,11 +474,7 @@ bool VADisplayState::Initialize() {
-   return success;
- }
- 
--bool VADisplayState::InitializeOnce() {
--  static_assert(
--      VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
--      "Requires VA-API >= 1.1.0");
--
-+bool VADisplayState::InitializeVaDisplay_Locked() {
-   switch (gl::GetGLImplementation()) {
-     case gl::kGLImplementationEGLGLES2:
-       va_display_ = vaGetDisplayDRM(drm_fd_.get());
-@@ -519,25 +517,10 @@ bool VADisplayState::InitializeOnce() {
-     return false;
-   }
- 
--  // Set VA logging level and driver name, unless already set.
--  constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
--  std::unique_ptr<base::Environment> env(base::Environment::Create());
--  if (!env->HasVar(libva_log_level_env))
--    env->SetVar(libva_log_level_env, "1");
--
--#if defined(USE_X11)
--  if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE) {
--    DCHECK(!features::IsUsingOzonePlatform());
--    constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
--    // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
--    // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
--    // is discussion of the issue here:
--    // https://github.com/intel/media-driver/issues/818
--    if (!env->HasVar(libva_driver_impl_env))
--      env->SetVar(libva_driver_impl_env, "i965");
--  }
--#endif  // USE_X11
-+  return true;
-+}
- 
-+bool VADisplayState::InitializeVaDriver_Locked() {
-   // The VAAPI version.
-   int major_version, minor_version;
-   VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
-@@ -545,9 +528,6 @@ bool VADisplayState::InitializeOnce() {
-     LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
-     return false;
-   }
--
--  va_initialized_ = true;
--
-   const std::string va_vendor_string = vaQueryVendorString(va_display_);
-   DLOG_IF(WARNING, va_vendor_string.empty())
-       << "Vendor string empty or error reading.";
-@@ -555,6 +535,8 @@ bool VADisplayState::InitializeOnce() {
-            << va_vendor_string;
-   implementation_type_ = VendorStringToImplementationType(va_vendor_string);
- 
-+  va_initialized_ = true;
-+
-   // The VAAPI version is determined from what is loaded on the system by
-   // calling vaInitialize(). Since the libva is now ABI-compatible, relax the
-   // version check which helps in upgrading the libva, without breaking any
-@@ -571,6 +553,45 @@ bool VADisplayState::InitializeOnce() {
-   return true;
- }
- 
-+bool VADisplayState::InitializeOnce() {
-+  static_assert(
-+      VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
-+      "Requires VA-API >= 1.1.0");
-+
-+  // Set VA logging level, unless already set.
-+  constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
-+  std::unique_ptr<base::Environment> env(base::Environment::Create());
-+  if (!env->HasVar(libva_log_level_env))
-+    env->SetVar(libva_log_level_env, "1");
-+
-+  if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-+    return false;
-+
-+#if defined(USE_X11)
-+  if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
-+      implementation_type_ == VAImplementation::kIntelIHD) {
-+    DCHECK(!features::IsUsingOzonePlatform());
-+    constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
-+    // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
-+    // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
-+    // is discussion of the issue here:
-+    // https://github.com/intel/media-driver/issues/818
-+    if (!env->HasVar(libva_driver_impl_env))
-+      env->SetVar(libva_driver_impl_env, "i965");
-+
-+    // Re-initialize with the new driver.
-+    va_display_ = nullptr;
-+    va_initialized_ = false;
-+    implementation_type_ = VAImplementation::kInvalid;
-+
-+    if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
-+      return false;
-+  }
-+#endif  // USE_X11
-+
-+  return true;
-+}
-+
- VAStatus VADisplayState::Deinitialize() {
-   base::AutoLock auto_lock(va_lock_);
-   VAStatus va_res = VA_STATUS_SUCCESS;
diff --git a/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch b/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
deleted file mode 100644
index 4ad4f6e23bb..00000000000
--- a/srcpkgs/chromium/patches/upstream-remove-dead-reloc-in-nonalloc-LD-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 74b0cb5b86f7d7f8f7c1172d85b09096bef147b7 Mon Sep 17 00:00:00 2001
-From: Daniel Nicoara <dnicoara@chromium.org>
-Date: Thu, 24 Sep 2020 02:34:24 +0000
-Subject: [PATCH] Remove dead-reloc-in-nonalloc LD flags
-
-Breakpad change landed. Revert workaround.
-
-Bug: 1105559
-Test: components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/andrd --binary=out/andrd/lib.unstripped/libcontent_shell_content_view.so --symbols-dir=/tmp/foo --platform=android
-Change-Id: I519534002898a97b15a57b9b87ac78ef3f216dee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427349
-Commit-Queue: Nico Weber <thakis@chromium.org>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#810066}
----
- build/config/compiler/BUILD.gn | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index aa9eca20bd2..42839cfba3f 100644
---- build/config/compiler/BUILD.gn
-+++ build/config/compiler/BUILD.gn
-@@ -396,14 +396,6 @@ config("compiler") {
-         "-Wl,--as-needed",
-       ]
-     }
--    if (use_lld && !is_chromeos_device) {
--      # TODO(thakis): Fix dump_syms to not need this and then remove it,
--      # https://crbug.com/1105559
--      ldflags += [
--        "-Wl,-z,dead-reloc-in-nonalloc=*=0",
--        "-Wl,-z,dead-reloc-in-nonalloc=.debug_ranges=1",
--      ]
--    }
-   }
- 
-   # Linux-specific compiler flags setup.
diff --git a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch b/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
deleted file mode 100644
index 00300a4a919..00000000000
--- a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Wed, 21 Oct 2020 22:02:35 +0000
-Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
-
-x11::Input::Fp1616 should be treated as a signed integer, otherwise
--1 will underflow to 65535.  When dragging a scrollbar, this would
-cause the scrollbar to snap to the bottom when the cursor is dragged
-above the window's y=0 coordinate.  Verified that the issue is fixed
-after this CL.
-
-BUG=1139623,1136352
-R=sky
-
-Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#819538}
----
- ui/events/x/events_x_utils.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/events/x/events_x_utils.cc b/ui/events/x/events_x_utils.cc
-index 3010db5f40c..856dfb221e7 100644
---- ui/events/x/events_x_utils.cc
-+++ ui/events/x/events_x_utils.cc
-@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(const x11::Event& xev) {
- 
- // This is ported from libxi's FP1616toDBL in XExtInt.c
- double Fp1616ToDouble(x11::Input::Fp1616 x) {
--  auto x32 = static_cast<uint32_t>(x);
-+  auto x32 = static_cast<int32_t>(x);
-   return x32 * 1.0 / (1 << 16);
- }
- 
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
index b6a43980c04..792befb3a39 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
@@ -26,15 +26,6 @@ index 7198e59..3300485 100644
    }
  
    configs -= [ "//build/config/compiler:chromium_code" ]
-@@ -401,6 +403,8 @@ static_library("libvp9rc") {
-     } else {
-       sources = libvpx_srcs_arm64
-     }
-+  } else if (current_cpu == "ppc64") {
-+    sources = libvpx_srcs_ppc64
-   }
-   sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.cc" ]
-   sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.h" ]
 diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
 index bcf84b0..8a3f4f1 100755
 --- third_party/libvpx/generate_gni.sh
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 1f5fca76ea3..b64640e0d1f 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3248,9 +3248,9 @@ index 9fc5db28..5f69f8dc 100644
  
 diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
 index 58bfa8f8..8fc37c46 100644
---- third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
+--- third_party/crashpad/crashpad/util/posix/signals_test.cc.orig	2020-11-17 13:39:47.000000000 -0500
++++ third_party/crashpad/crashpad/util/posix/signals_test.cc	2020-11-18 21:06:33.433408623 -0500
+@@ -46,9 +46,9 @@
    return sig == SIGABRT ||
           sig == SIGALRM ||
           sig == SIGBUS ||
@@ -3261,12 +3261,8 @@ index 58bfa8f8..8fc37c46 100644
 +#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
  #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
           sig == SIGILL ||
--#endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-          sig == SIGPIPE ||
-          sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@
        break;
      }
  
@@ -3279,7 +3275,7 @@ index 58bfa8f8..8fc37c46 100644
      case SIGFPE: {
        // Optimization makes this tricky, so get zero from a system call likely
        // to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+@@ -137,7 +139,7 @@
        fstat(quotient, &stat_buf);
        break;
      }
@@ -3544,9 +3540,9 @@ index 122e26ad..ec21dcb5 100644
         defined(__ARMEB__) || defined(__AARCH64EB__)
 diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
 index dd9ab457..c005d959 100644
---- third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+--- third_party/webrtc/modules/desktop_capture/differ_block.cc.orig	2020-11-17 13:42:02.000000000 -0500
++++ third_party/webrtc/modules/desktop_capture/differ_block.cc	2020-11-18 21:11:03.039905360 -0500
+@@ -30,11 +30,7 @@
    static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
  
    if (!diff_proc) {
@@ -3556,10 +3552,10 @@ index dd9ab457..c005d959 100644
 -    diff_proc = &VectorDifference_C;
 -#else
 +#if defined(WEBRTC_ARCH_X86_FAMILY)
-     bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
      // For x86 processors, check if SSE2 is supported.
      if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+@@ -44,6 +40,10 @@
      } else {
        diff_proc = &VectorDifference_C;
      }
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index e9db11e215c..b31a09ed1f6 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=86.0.4240.193
+version=87.0.4280.66
 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=203dd5097f5873cb4881e2e838034f0dac5ff13e7fafa286baf87937f8eca534
+checksum=29a8e4ea82edec2fdcf34ece68323bec7ab90f3d5669e6b77f58cff9c278f741
 nocross=yes
 
 lib32disabled=yes

From 89defeefd5980adf42448504be8b570d212edd61 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 19 Nov 2020 12:51:05 -0500
Subject: [PATCH 0098/3595] chromium-widevine: update to 87.0.4280.66.

---
 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 aff7dc79c3c..a8de96756c4 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=fc4a4717ddf9623eeb2ebd4cf0f3a845a20fab34bb2831af2a264507b6432ef4
+checksum=e7e4c6a2108140c572562867f522d0311a25ce03ea36c5452cb8431865871226
 _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 03908e02ca5..66626f83af3 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=86.0.4240.193
+version=87.0.4280.66
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From f361e8916d052c122a3214a7c1beecc0c98bfae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 19 Nov 2020 23:43:25 -0300
Subject: [PATCH 0099/3595] elfutils: fix vmove for libdebuginfod.

Applications linked against libdebuginfod will be linked against its
soname, which is a symlink that was ending up in the libelf subpackage.
---
 srcpkgs/elfutils/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index a2a10ab6e63..3dfea2970a5 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'elfutils'
 pkgname=elfutils
 version=0.182
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"
@@ -14,6 +14,8 @@ license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
 checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858
+# subpackages require explicit ordering
+subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
 CFLAGS="-Wno-error"
 CXXFLAGS="-Wl,-z,stack-size=2097152"
@@ -38,7 +40,7 @@ pre_configure() {
 libdebuginfod_package() {
 	short_desc+=" - debuginfod library"
 	pkg_install() {
-		vmove "usr/lib/libdebuginfod-*.so*"
+		vmove "usr/lib/libdebuginfod*.so*"
 		vmove etc/profile.d
 	}
 }

From 54ae0764778dde738f5af1d4c1aace1a7e643684 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 15:41:15 +0100
Subject: [PATCH 0100/3595] tcsh: update to 6.22.03.

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

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 2979c859232..ba88789c632 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
 # Template file for 'tcsh'
 pkgname=tcsh
-version=6.22.02
+version=6.22.03
 revision=1
 build_style=gnu-configure
 conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://www.tcsh.org/"
 distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b
+checksum=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7
 register_shell="/bin/tcsh /bin/csh"
 
 CFLAGS="-fcommon"

From f35c448c6d139228ed5d16dc37c56cd4892419ac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Nov 2020 16:08:26 +0100
Subject: [PATCH 0101/3595] erlang: update to 23.1.3.

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

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

From ab196d646a0bbdd382b10f556a1797c2fc679ad1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 10:56:44 +0100
Subject: [PATCH 0102/3595] perl-Search-Xapian: update to 1.2.25.4.

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

diff --git a/srcpkgs/perl-Search-Xapian/template b/srcpkgs/perl-Search-Xapian/template
index fd7bcb15ace..6e7a8db4a20 100644
--- a/srcpkgs/perl-Search-Xapian/template
+++ b/srcpkgs/perl-Search-Xapian/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Search-Xapian'
 pkgname=perl-Search-Xapian
-version=1.2.25.2
-revision=3
+version=1.2.25.4
+revision=1
 wrksrc="Search-Xapian-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,6 +12,6 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Search-Xapian"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/Search/Search-Xapian-${version}.tar.gz"
-checksum=24955a284279fdbc5a324a5b73b09585ae506932be19a7105e114834e243ea42
+checksum=871943199b80efd98e31f4b4711bb070a576c91be692193d8a43affad64574dd
 
 make_build_args='CC=$(CXX)'  # ugh

From 01ccaa42bd1c558b7e0650ba3fb66b82083d5059 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 11:00:55 +0100
Subject: [PATCH 0103/3595] crash: update to 7.2.9.

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

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index d1961f950f4..2326da52c3e 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,7 +1,7 @@
 # Template file for 'crash'
 pkgname=crash
-version=7.2.8
-revision=2
+version=7.2.9
+revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
 hostmakedepends="flex tar wget"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://crash-utility.github.io/"
 changelog="https://crash-utility.github.io/crash.changelog.html"
 distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz"
-checksum=996d3367764c77e23921c164725e4d0221acc7a15a92a3f825053ea37f2452dc
+checksum=6c07634f7357906dcb21ff3decd1760d7b0b1a11c01472cd17aba2e67f3ce16e
 nocross=yes
 LDFLAGS=-llzo2
 

From 8ac8a674cef1fab80c2441d8d52025d0ad5f592d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 20 Nov 2020 11:04:51 +0100
Subject: [PATCH 0104/3595] ipset: update to 7.9.

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

diff --git a/common/shlibs b/common/shlibs
index d896815d3ea..9e730c9437a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3645,7 +3645,7 @@ libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.0_1
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
-libipset.so.12 libipset-7.7_1
+libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
 libliquid.so.1 liquid-dsp-1.3.1_1
 libsnore-qt5.so.0.7 snorenotify-0.7.0_1
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 6a47b78c6cc..3b892b478f0 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.7
+version=7.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://ipset.netfilter.org/"
 distfiles="${homepage}${pkgname}-${version}.tar.bz2"
-checksum=45a50d581ba4d6688081e2b0328245914ba9807f8ec682c1aa619040d1316c32
+checksum=b75c13689eddf1d95b396840a69dc04fd7ae4112b10b70594bc0405df7b9b30a
 
 libipset_package() {
 	short_desc+=" - library files"

From 187181e459a8c55d7044dc027d0a06e59c05fe2c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 20 Nov 2020 07:37:31 +0100
Subject: [PATCH 0105/3595] kotlin-bin: update to 1.4.20.

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

diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index 40760715daf..5492c2eb096 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'kotlin-bin'
 pkgname=kotlin-bin
-version=1.4.10
+version=1.4.20
 revision=1
 archs="x86_64"
 wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="Apache-2.0"
 homepage="https://kotlinlang.org/"
 distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=bb1a21d70e521a01ae104e99a082a6e7bb58699b86347049da521d175d0dace7
+checksum=11db93a4d6789e3406c7f60b9f267eba26d6483dcd771eff9f85bb7e9837011f
 nostrip=yes
 replaces="kotlin>=0"
 

From ce8dc487d8977439ac5ee69f90176a2a9f65dc96 Mon Sep 17 00:00:00 2001
From: xXR01I1Xx <xxr01i1xx@tuta.io>
Date: Mon, 8 Jun 2020 18:34:18 +0200
Subject: [PATCH 0106/3595] New package: emptty-0.3.0

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

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
new file mode 100644
index 00000000000..c68a5c53eb1
--- /dev/null
+++ b/srcpkgs/emptty/template
@@ -0,0 +1,23 @@
+# Template file for 'emptty'
+pkgname=emptty
+version=0.3.0
+revision=1
+build_style=go
+go_import_path=github.com/tvrzna/emptty
+makedepends="pam-devel libX11-devel"
+short_desc="Dead simple Display Manager running in CLI as TTY login"
+maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
+license="MIT"
+homepage="https://github.com/tvrzna/emptty"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=fa8a6336e150f0f74813ccf71817228deed9e06f1c8362e41634def959ff6c2b
+conf_files="/etc/emptty/conf /etc/pam.d/emptty"
+
+post_install() {
+	vinstall res/pam 644 etc/pam.d emptty
+	vinstall res/runit-run 755 etc/sv/emptty run
+	vinstall res/conf 644 etc/emptty
+	vman res/emptty.1
+	vlicense LICENSE
+	ln -s /run/runit/supervise.emptty ${DESTDIR}/etc/sv/emptty/supervise
+}

From a402c359718d43c58c357495a57621fe38e13334 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 20 Nov 2020 07:38:39 +0100
Subject: [PATCH 0107/3595] git-secret: update to 0.3.3.

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

diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template
index 01541c9b061..4dcb69ebf6a 100644
--- a/srcpkgs/git-secret/template
+++ b/srcpkgs/git-secret/template
@@ -1,8 +1,7 @@
 # Template file for 'git-secret'
 pkgname=git-secret
-version=0.3.2
+version=0.3.3
 revision=1
-archs=noarch
 build_style=gnu-makefile
 make_install_args="PREFIX=/usr"
 depends="bash gawk gnupg coreutils"
@@ -11,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="http://git-secret.io/"
 distfiles="https://github.com/sobolevn/git-secret/archive/v${version}.tar.gz"
-checksum=07b32b096e5ff5b4818096b1858c1f69df4684bb0f256e620514cf88f44ded85
+checksum=d8c19a5cbd174e95484a4233605985dd3b060a8a83d14d41c3bad1d534c6ab39
 
 do_install() {
 	vbin git-secret

From 4b66a36a74df4db76b84d9040cea0a6216bc9417 Mon Sep 17 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, 20 Nov 2020 23:59:17 +0700
Subject: [PATCH 0108/3595] imapfilter: fix build

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

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 850327bba1d..77e36d4d1e5 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -3,7 +3,7 @@ pkgname=imapfilter
 version=2.6.12
 revision=5
 build_style=gnu-makefile
-make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr"
+make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
 makedepends="pcre-devel lua53-devel libressl-devel"
 short_desc="Mail filtering utility"
@@ -13,6 +13,8 @@ homepage="https://github.com/lefcha/imapfilter"
 distfiles="https://github.com/lefcha/imapfilter/archive/v${version}.tar.gz"
 checksum=764a68c737e555d7b164644a4c491fd66cffb93d6077d58f502b94e1a022a884
 
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/lua5.3"
+
 post_configure() {
 	sed -i \
 		-e '/^MANDIR/s:/man:/share/man:' \

From 1b83eafeaa2dea006ba63ca218f9636336d2057b Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Nov 2020 12:46:01 -0500
Subject: [PATCH 0109/3595] neomutt: update to 20201120.

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

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 25c57cea6cc..786c88fab1d 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20200925
+version=20201120
 revision=1
 wrksrc="neomutt-${version}"
 create_wrksrc=true
@@ -23,7 +23,7 @@ homepage="https://neomutt.org/"
 _test_files_hash=8629adab700a75c54e8e28bf05ad092503a98f75
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="dcec98ea2454d7695ff92184c33a0051c2b3c46320f81f7889c4580c943140dd
+checksum="48191d4f17cb1e5fd094ca92c581e1bb9599f058c122cc0e35df4e1c0cb53f47
  a53d6447cf4e8f60bd9a3caf68a1cfe1bfda878b5bcb8c60b965b5214de73ff9"
 python_version=3
 
@@ -41,7 +41,7 @@ esac
 
 post_install() {
 	# move dist to examples dir
-	vsconf contrib/gpg.rc Muttrc.gpg.dist
+	vsconf contrib/samples/gpg.rc Muttrc.gpg.dist
 }
 
 pre_check() {

From 99ca31cb777d3a94cf07545ca26779a341449071 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Nov 2020 14:34:15 -0500
Subject: [PATCH 0110/3595] python3-pyopencl: update to 2020.3.1.

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

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 43a5a3b8426..49ef0a074a7 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2020.3
+version=2020.3.1
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11, Apache-2.0, BSD-3-Clause"
 homepage="https://mathema.tician.de/software/pyopencl"
 distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=4aa3031c17fc99aa2f3018ef2c9e1d535c3cfdc7a01bb987b1ea3826ef42bd59
+checksum=abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 5bb7ed65bbf0e3bdddd9b3b47a55e56ebd8e8b63 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Tue, 17 Nov 2020 08:58:33 -0700
Subject: [PATCH 0111/3595] youtube-dl: update to 2020.11.19

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

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 54187e923c8..8f2945c9934 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.11.12
+version=2020.11.19
 revision=1
 wrksrc="${pkgname}"
 build_style=python3-module
@@ -11,9 +11,9 @@ short_desc="CLI program to download videos from YouTube and other sites"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Unlicense"
 homepage="https://yt-dl.org"
-changelog="https://gitlab.com/dstftw/youtube-dl/-/raw/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
 distfiles="${homepage}/downloads/latest/${pkgname}-${version}.tar.gz"
-checksum=aeb00b2079c4711de7eea2a91f6923ebade84c5e985b0caeb47d572395d42831
+checksum=f8c14d9eb2fd8fe7242de8b96f2c918810867c518a162405644f483dcd14be9e
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From a915124afd6f7e987a3794d495fd76814e1216a2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 20 Nov 2020 21:54:08 +0100
Subject: [PATCH 0112/3595] libostree: update to 2020.8.

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

diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index df9fd6e8bba..abad94721be 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,14 +1,17 @@
 # Template file for 'libostree'
 pkgname=libostree
-version=2020.3
-revision=2
+version=2020.8
+revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--with-builtin-grub2-mkconfig --with-openssl
+configure_args="
+ --with-builtin-grub2-mkconfig
+ --with-ed25519-libsodium
+ --with-openssl
  $(vopt_enable gir introspection)"
 hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config"
 makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel
- libsoup-devel $(vopt_if gir 'gobject-introspection')"
+ libsoup-devel libsodium-devel $(vopt_if gir 'gobject-introspection')"
 checkdepends="attr-progs cpio elfutils python3-yaml"
 short_desc="Operating system and container binary deployment and upgrades"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -16,7 +19,7 @@ license="LGPL-2.0-or-later"
 homepage="https://ostree.readthedocs.io/en/latest/"
 changelog="https://github.com/ostreedev/ostree/releases"
 distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=5877396ea092f5b6701c17bd20280746cad20f55a94c760dbeba0fa115818c05
+checksum=fdaa5992d0a6f62157152355449ac8476c50df6602be398e9ad10438cc1e679b
 
 build_options="gir"
 build_options_default="gir"

From 57c6d73f0549a1bd2ef8ce4a3c477858e3080fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 16:24:31 +0100
Subject: [PATCH 0113/3595] wlroots: update to 0.12.0

---
 common/shlibs            |  2 +-
 srcpkgs/wlroots/template | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9e730c9437a..f0e379421f4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3565,7 +3565,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
-libwlroots.so.6 wlroots-0.11.0_1
+libwlroots.so.7 wlroots-0.12.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
 libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 8968bba8cef..a73b5f21a13 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,13 +1,13 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
 build_style=meson
-configure_args="-Dlogind=enabled -Dlogind-provider=elogind
+configure_args="-Dlogind=disabled -Dlibseat=enabled
  -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
  -Dx11-backend=enabled -Dexamples=false"
 hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel elogind-devel eudev-libudev-devel libdrm-devel
+_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-errors-devel xcb-util-wm-devel"
 makedepends="${_devel_depends}
@@ -18,7 +18,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/swaywm/wlroots"
 distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01
+checksum=c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb
 
 post_install() {
 	vlicense LICENSE

From d422587d7f9fc9e0235912957c7f50a5910fc636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:26:29 +0100
Subject: [PATCH 0114/3595] cage: disable SUID

---
 srcpkgs/cage/INSTALL.msg |  6 ++++++
 srcpkgs/cage/template    | 10 +++-------
 2 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/cage/INSTALL.msg

diff --git a/srcpkgs/cage/INSTALL.msg b/srcpkgs/cage/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/cage/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..960ccfac215 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,12 +1,12 @@
 # Template file for 'cage'
 pkgname=cage
 version=0.1.2.1
-revision=2
+revision=3
 build_style=meson
 configure_args="$(vopt_bool xwayland xwayland)"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots-devel"
-depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Kiosk compositor for Wayland"
 maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
@@ -14,14 +14,10 @@ homepage="https://www.hjdskes.nl/projects/cage/"
 distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
 checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac
 
-build_options="elogind xwayland"
+build_options="xwayland"
 build_options_default="xwayland"
 desc_option_xwayland="Enable Xwayland support in cage"
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/cage
-	fi
 	vlicense LICENSE
 }

From 50a5522e96d68dd387dbc09078b4c8dabecaf1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:31:14 +0100
Subject: [PATCH 0115/3595] hikari: disable suid

---
 srcpkgs/hikari/INSTALL.msg | 6 ++++++
 srcpkgs/hikari/template    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/hikari/INSTALL.msg

diff --git a/srcpkgs/hikari/INSTALL.msg b/srcpkgs/hikari/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/hikari/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index b071ccf75bb..0828aa3aade 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,13 +1,13 @@
 # Template file for 'hikari'
 pkgname=hikari
 version=2.2.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_cmd=bmake
 make_use_env=yes
 make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
  WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
-make_install_args="ETC_PREFIX="
+make_install_args="ETC_PREFIX= WITHOUT_SUID=YES"
 hostmakedepends="bmake pkg-config wayland-devel"
 makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
 short_desc="Stacking Wayland compositor with tiling features"

From 75bbdf77faa5a4c04563c3fdfd04eeb88e8941e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:01:36 +0100
Subject: [PATCH 0116/3595] wf-config: update to 0.6.0

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

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index ce7fce82dc1..bc6a2c8b870 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
-checksum=bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0
+checksum=73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b
 
 post_install() {
 	vlicense LICENSE

From 487153b1cdf9563353d480b4e234314b07f026d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:38:01 +0100
Subject: [PATCH 0117/3595] wayfire: update to 0.6.0

---
 srcpkgs/wayfire/INSTALL.msg                |  9 ++++---
 srcpkgs/wayfire/patches/fix_switcher.patch | 30 ++++++++++++++++++++++
 srcpkgs/wayfire/template                   | 23 +++++++++--------
 3 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/wayfire/patches/fix_switcher.patch

diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg
index 164d23c2b3a..05274ffcc3a 100644
--- a/srcpkgs/wayfire/INSTALL.msg
+++ b/srcpkgs/wayfire/INSTALL.msg
@@ -1,5 +1,6 @@
-Before running Wayfire, copy the default configuration file to your user:
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
 
-  cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini
-
-You also probably want to install elogind, then restart your computer
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch
new file mode 100644
index 00000000000..a09e43d12e6
--- /dev/null
+++ b/srcpkgs/wayfire/patches/fix_switcher.patch
@@ -0,0 +1,30 @@
+--- plugins/single_plugins/switcher.cpp	2020-11-18 15:30:44.970379825 +0100
++++ plugins/single_plugins/switcher.cpp	2020-11-18 15:30:31.068223026 +0100
+@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi
+             active = true;
+ 
+             // grabs shouldn't fail if we could successfully activate plugin
+-            assert(grab_interface->grab());
++            auto grab = grab_interface->grab();
++            assert(grab);
+ 
+             focus_next(dir);
+             arrange();
+--- src/view/layer-shell.cpp	2020-11-18 15:30:44.970379825 +0100
++++ src/view/layer-shell.cpp	2020-11-18 15:30:40.404328323 +0100
+@@ -1,5 +1,6 @@
+ #include <algorithm>
+ #include <cstring>
++#include <cstdlib>
+ 
+ #include "xdg-shell.hpp"
+ #include "wayfire/core.hpp"
+@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc
+         return wf::workspace_manager::ANCHORED_EDGE_RIGHT;
+     }
+ 
+-    assert(false);
++    abort();
+ }
+ 
+ struct wf_layer_shell_manager
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..22c5494af07 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,23 +1,26 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.5.0
+version=0.6.0
 revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
- https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
-checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
- 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
+ https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
+checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+ d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
+ 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
 
-build_options="elogind image"
+build_options="image"
 build_options_default="image"
 desc_option_image="Enable JPEG and PNG support"
 
@@ -27,14 +30,12 @@ fi
 
 post_extract() {
 	rmdir subprojects/wf-utils
+	rmdir subprojects/wf-touch
 	mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+	mv ../wf-touch-${_touch_commit} subprojects/wf-touch
 }
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/wayfire
-	fi
 	vlicense LICENSE
 	vsconf wayfire.ini
 	vinstall wayfire.desktop 0644 usr/share/wayland-sessions

From 77303fde9acae5124d1280352ee5bbf00bb603aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 19:45:24 +0100
Subject: [PATCH 0118/3595] wayfire-plugins-extra: update to 0.6.0

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

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 2eaa4bbbea6..ff0e06c655c 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'wayfire-plugins-extra'
 pkgname=wayfire-plugins-extra
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/${version}.tar.gz"
-checksum=64c56ffa66df26a7cbee1af41c34ae123abe8252deeaf02687237688a8281a9e
+checksum=d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e
 
 post_install() {
 	vlicense LICENSE

From a0f83c9f1708b7ff876a4bd4acfb743b2e14e19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 17:43:47 +0100
Subject: [PATCH 0119/3595] sway: update to 1.5.1

---
 srcpkgs/sway/INSTALL.msg |  6 ++++++
 srcpkgs/sway/template    | 15 ++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/sway/INSTALL.msg

diff --git a/srcpkgs/sway/INSTALL.msg b/srcpkgs/sway/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/sway/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index fa8e1850c50..4255e6ed724 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,21 +1,19 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.5
-revision=2
+version=1.5.1
+revision=1
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
 makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel"
-depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178
-
-build_options="elogind"
+checksum=095f983c9a5f80d761bc2fb19df8166839b9290124ccd47f3e74119a1335490f
 
 post_patch() {
 	vsed -e 's/werror=true/werror=false/g' -i meson.build
@@ -23,10 +21,6 @@ post_patch() {
 
 post_install() {
 	vlicense LICENSE
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/sway
-	fi
 	vbin contrib/grimshot
 	vman contrib/grimshot.1
 }
@@ -34,7 +28,6 @@ post_install() {
 grimshot_package() {
 	short_desc="Helper for screenshots within sway"
 	depends="grim slurp sway wl-clipboard jq libnotify"
-	archs="noarch"
 	pkg_install() {
 		vmove usr/bin/grimshot
 		vmove usr/share/man/man1/grimshot.1

From e7a2293c2302204173d7285b71c7eb8a5d4eb43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Tue, 10 Nov 2020 20:21:04 +0100
Subject: [PATCH 0120/3595] wcm: update to 0.6.0

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

diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template
index d74eba5e556..b32e76ccff1 100644
--- a/srcpkgs/wcm/template
+++ b/srcpkgs/wcm/template
@@ -1,6 +1,6 @@
 # Template file for 'wcm'
 pkgname=wcm
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz"
-checksum=9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341
+checksum=bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f
 
 post_install() {
 	vlicense LICENSE

From 8db7562eaf62c5018b506d8e1e9ac8bfb9210213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Fri, 13 Nov 2020 11:19:28 +0100
Subject: [PATCH 0121/3595] wofi: update to 1.2.3

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

diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template
index 4c21a047785..80863c765ef 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
 # Template file for 'wofi'
 pkgname=wofi
-version=1.2.2
-revision=2
+version=1.2.3
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://hg.sr.ht/~scoopta/wofi"
 distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz"
-checksum=@4e5193fe7eb29d08ee0249aa1d6dbb343b9b1fe54b11abfeb06f7c2015270431
+checksum=@3ef3ff39eb6c72f20a70486a40f0060150044b701db84489f9773f309673f8e7

From ed3929c6cee54efce0d71a101721860eb2640491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Wed, 18 Nov 2020 15:21:02 +0100
Subject: [PATCH 0122/3595] wf-shell: update to 0.6.1

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

diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index f88d967d172..47f0a42376b 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,9 +1,10 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.5.0
+version=0.6.1
 revision=1
 build_style=meson
 build_helper="gir"
+configure_args="-Dwayland-logout:implementation=c"
 hostmakedepends="gobject-introspection pkg-config wayland-devel"
 makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire-devel
  gtk+3-devel gtk-layer-shell-devel"
@@ -11,8 +12,8 @@ short_desc="Wayfire shell with GTK-based panel and background client"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"
-checksum=fa481e867784b94b08857ec7bd27bf43251490d5d50c1e834e7ea64d908792f0
+distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"
+checksum=da8e5a16dde8f44966d41449452bcc7bc2466d5945324aca714ecc82827c884a
 
 post_install() {
 	vlicense LICENSE

From 9df5c7cd8f0c16d293a0d2296d142fc16a24d445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 20 Nov 2020 13:13:28 -0300
Subject: [PATCH 0123/3595] autoconf_cache/musl-linux: fix sigprocmask value.

It was "1", should have been "yes". This fixes building gettext.
---
 common/environment/configure/autoconf_cache/musl-linux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/autoconf_cache/musl-linux b/common/environment/configure/autoconf_cache/musl-linux
index 396c51c538c..58cc913109c 100644
--- a/common/environment/configure/autoconf_cache/musl-linux
+++ b/common/environment/configure/autoconf_cache/musl-linux
@@ -40,7 +40,7 @@ gl_cv_func_gettimeofday_posix_signature=yes
 gl_cv_func_lseek_pipe=yes
 gl_cv_func_mbrtowc_retval=yes
 gl_cv_func_posix_spawn_works=yes
-gl_cv_func_sigprocmask=1
+gl_cv_func_sigprocmask=yes
 gl_cv_func_spawnattr_setschedparam=yes
 gl_cv_func_spawnattr_setschedpolicy=yes
 gl_cv_func_stat_dir_slash=yes

From ee922d79f0cb8c09afe7aef1399a9534376762a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 20 Nov 2020 18:57:56 -0300
Subject: [PATCH 0124/3595] srcpkgs: remove execute permission from leftover
 templates.

---
 srcpkgs/aspell-pl/template       | 0
 srcpkgs/colord-kde/template      | 0
 srcpkgs/dolphin-plugins/template | 0
 srcpkgs/emacs/template           | 0
 srcpkgs/font-vazir/template      | 0
 srcpkgs/libtd/template           | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 srcpkgs/aspell-pl/template
 mode change 100755 => 100644 srcpkgs/colord-kde/template
 mode change 100755 => 100644 srcpkgs/dolphin-plugins/template
 mode change 100755 => 100644 srcpkgs/emacs/template
 mode change 100755 => 100644 srcpkgs/font-vazir/template
 mode change 100755 => 100644 srcpkgs/libtd/template

diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/colord-kde/template b/srcpkgs/colord-kde/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
old mode 100755
new mode 100644
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
old mode 100755
new mode 100644

From 17993eeedb6bf4fc97d0662b5fba79d429c77026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 16 Nov 2020 23:42:30 -0300
Subject: [PATCH 0125/3595] Disable Travis CI.

- Remove .travis.yml, common/travis/docker.sh.
- Change references to travis to be more generic.
- Manual.md: Orient against using CI logs in broken= or nocross=.
---
 .travis.yml             | 41 -----------------------------------------
 Manual.md               |  6 ++----
 README.md               |  2 +-
 common/travis/docker.sh | 18 ------------------
 xbps-src                |  2 +-
 5 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100755 common/travis/docker.sh

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 42ef134aa4d..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: bash
-dist: bionic
-
-git:
-    depth: 200
-
-env:
-    global:
-        - PATH=$PATH:/tmp/bin
-        - DOCKER_BASE=voidlinux/masterdir
-        - TAG=20200607RC01
-
-    matrix:
-        - XLINT=1 LICENSE_LIST=common/travis/license.lst
-        - ARCH=x86_64 BOOTSTRAP=x86_64
-        - ARCH=i686 BOOTSTRAP=i686
-        - ARCH=aarch64 BOOTSTRAP=x86_64
-        - ARCH=armv7l BOOTSTRAP=x86_64
-        - ARCH=x86_64-musl BOOTSTRAP=x86_64-musl
-        - ARCH=armv6l-musl BOOTSTRAP=x86_64-musl
-        - ARCH=aarch64-musl BOOTSTRAP=x86_64-musl
-
-install:
-    - common/travis/docker.sh
-
-before_script:
-    - common/travis/set_mirror.sh
-    - common/travis/prepare.sh
-    - common/travis/fetch_upstream.sh
-    - common/travis/changed_templates.sh
-    - common/travis/fetch-xtools.sh
-    - common/travis/xlint.sh
-
-script:
-    - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi
-
-after_script:
-    - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/show_files.sh $BOOTSTRAP $ARCH; fi
-
-notifications:
-    email: false
diff --git a/Manual.md b/Manual.md
index 0833d5fdd1c..c520d06c133 100644
--- a/Manual.md
+++ b/Manual.md
@@ -631,8 +631,7 @@ in /usr/share directory specified by absolute path, which are expected and allow
 specified by absolute path, which are expected and allowed to contain machine code files.
 
 - `nocross` If set, cross compilation won't be allowed and will exit immediately.
-This should be set to a string describing why it fails, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it fails, or a link to a buildlog (from the official builders, CI buildlogs can vanish) demonstrating the failure.
 
 - `restricted` If set, xbps-src will refuse to build the package unless
 `etc/conf` has `XBPS_ALLOW_RESTRICTED=yes`. The primary builders for Void
@@ -645,8 +644,7 @@ to override the guessed list. Only use this if a specific order of subpackages i
 otherwise the default would work in most cases.
 
 - `broken` If set, building the package won't be allowed because its state is currently broken.
-This should be set to a string describing why it is broken, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it is broken, or a link to a buildlog demonstrating the failure.
 
 - `shlib_provides` A white space separated list of additional sonames the package provides on.
 This appends to the generated file rather than replacing it.
diff --git a/README.md b/README.md
index 9238b1918ef..ce2d49d2a4a 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ into a `masterdir` that is used as its main `chroot` directory. `xbps-src` suppo
 multiple utilities to accomplish this task:
 
  - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with travis).
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
  - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
  - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
  - `proot(1)` - utility that implements chroot/bind mounts in user space, see https://proot-me.github.io/.
diff --git a/common/travis/docker.sh b/common/travis/docker.sh
deleted file mode 100755
index 9b98b42c016..00000000000
--- a/common/travis/docker.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# docker.sh
-
-[ "$XLINT" ] && exit 0
-
-DOCKER_NAME=${DOCKER_NAME:-void}
-
-/bin/echo -e "\x1b[32mPulling docker image $DOCKER_BASE-$BOOTSTRAP:$TAG...\x1b[0m"
-docker pull $DOCKER_BASE-$BOOTSTRAP:$TAG
-docker run -d \
-	   --name $DOCKER_NAME \
-	   -v "$(pwd)":/hostrepo \
-	   -v /tmp:/tmp \
-	   -e XLINT="$XLINT" \
-	   -e PATH="$PATH" \
-	   $DOCKER_BASE-$BOOTSTRAP:$TAG \
-	   /bin/sh -c 'sleep inf'
diff --git a/xbps-src b/xbps-src
index 3cd19dc42ec..ad999439d3a 100755
--- a/xbps-src
+++ b/xbps-src
@@ -486,7 +486,7 @@ if [ -z "$IN_CHROOT" ]; then
 fi
 
 # Forbid root unless XBPS_ALLOW_CHROOT_BREAKOUT is set
-# (for travis CI).
+# (for CI).
 if [ -z "$IN_CHROOT" -a "$UID" -eq 0 -a -z "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
     echo "ERROR: xbps-src cannot be used as root." 1>&2
     exit 1

From c488e5c0a3e265df6a5eab079d90f7d4d3398749 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 12 Nov 2020 19:21:04 +0100
Subject: [PATCH 0126/3595] wireshark: update to 3.4.0

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

diff --git a/common/shlibs b/common/shlibs
index f0e379421f4..23f84b3d796 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1625,9 +1625,9 @@ libdovecot-lda.so.0 dovecot-2.2.11_2
 libnetapi.so.0 samba-3.6.23_1
 libsmbsharemodes.so.0 samba-3.6.23_1
 libmysqld.so.18 libmariadbclient-5.5.36_1
-libwiretap.so.10 libwireshark-3.2.0_1
-libwireshark.so.13 libwireshark-3.2.0_1
-libwsutil.so.11 libwireshark-3.2.0_1
+libwiretap.so.11 libwireshark-3.4.0_1
+libwireshark.so.14 libwireshark-3.4.0_1
+libwsutil.so.12 libwireshark-3.4.0_1
 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
 libKF5Prison.so.5 prison-5.43.0_1
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index e8615545c6b..7e6e9e24218 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=3.2.7
+version=3.4.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz"
-checksum=be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da
+checksum=67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae
 system_groups="wireshark"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"

From 713bce382d07064c97e574af55ba2910c5cbc527 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 21:30:13 +0100
Subject: [PATCH 0127/3595] xterm: update to 362.

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

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 5ece04ebed9..00e9362f1ba 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=361
+version=362
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -20,7 +20,7 @@ license="MIT"
 homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=85610f20d5e47205cc1b6876f7a4da28d6ae051bd8eac0b932e92c37a73a623f
+checksum=1d4ffe226fa8f021859bbc3007788ff63a46a31242d9bd9a7bd7ebe24e81aca2
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From e8197e8ec7704dd0021668228385eebc532bb8ca Mon Sep 17 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, 21 Nov 2020 07:24:03 +0700
Subject: [PATCH 0128/3595] mutt: update to 2.0.2. CVE-2020-28896

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

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 11b690bfab9..6003181d3b7 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.mutt.org"
 changelog="http://mutt.org/relnotes/${version%.*}"
 distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=0cf5fdea5616f655b101de3b5ed45412bc2cc721d517466ca6c645a829b021db
+checksum=471218babe97968a45704f1e1e17523c4620ad1f92bae4143a4c9749ab1411c8
 
 post_install() {
 	# provided by mime-types

From 053e82f70e281657789fb0c39bd5e46123263196 Mon Sep 17 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, 19 Nov 2020 23:16:50 +0700
Subject: [PATCH 0129/3595] choosenim: update to 0.7.4.

---
 ...3cd106185441604a55ef34968a2a37d6258a.patch |  25 -----
 ...ba5b72f8434eb690ae3b84f43968b8041a95.patch |  22 ----
 srcpkgs/choosenim/patches/ftbfs.patch         |  56 ----------
 .../choosenim/patches/system-libarchive.patch | 103 ++++++++++++++++++
 srcpkgs/choosenim/template                    |  42 ++++---
 5 files changed, 132 insertions(+), 116 deletions(-)
 delete mode 100644 srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
 delete mode 100644 srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
 delete mode 100644 srcpkgs/choosenim/patches/ftbfs.patch
 create mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch

diff --git a/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch b/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
deleted file mode 100644
index a7445e39527..00000000000
--- a/srcpkgs/choosenim/patches/cfc83cd106185441604a55ef34968a2a37d6258a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cfc83cd106185441604a55ef34968a2a37d6258a Mon Sep 17 00:00:00 2001
-From: Dominik Picheta <dominikpicheta@googlemail.com>
-Date: Mon, 14 Oct 2019 21:09:23 +0100
-Subject: [PATCH] Fixes #142.
-
-Fixes regression in choosenim install script.
----
- scripts/choosenim-unix-init.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/scripts/choosenim-unix-init.sh b/scripts/choosenim-unix-init.sh
-index a60b74b..89912cf 100755
---- scripts/choosenim-unix-init.sh
-+++ scripts/choosenim-unix-init.sh
-@@ -59,9 +59,8 @@ install() {
-     fi
- 
-     # Install Nim from desired channel.
--    "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall -y < /dev/tty
-+    "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall < /dev/tty
-   else
--    # TODO: Use the -y switch when choosenim gets support for it.
-     "$temp_prefix/$filename" $CHOOSE_VERSION --firstInstall -y
-   fi
- 
diff --git a/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch b/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
deleted file mode 100644
index a9e8c153eb2..00000000000
--- a/srcpkgs/choosenim/patches/f7aeba5b72f8434eb690ae3b84f43968b8041a95.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f7aeba5b72f8434eb690ae3b84f43968b8041a95 Mon Sep 17 00:00:00 2001
-From: Dominik Picheta <dominikpicheta@gmail.com>
-Date: Sun, 21 Apr 2019 20:29:41 +0100
-Subject: [PATCH] Fixes osinfo dependency conflict.
-
----
- choosenim.nimble | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/choosenim.nimble b/choosenim.nimble
-index d826357..b775d88 100644
---- choosenim.nimble
-+++ choosenim.nimble
-@@ -15,7 +15,7 @@ skipExt = @["nim"]
- 
- requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
- requires "libcurl >= 1.0.0"
--requires "analytics >= 0.1.1"
-+requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
- 
- task test, "Run the choosenim tester!":
diff --git a/srcpkgs/choosenim/patches/ftbfs.patch b/srcpkgs/choosenim/patches/ftbfs.patch
deleted file mode 100644
index f5bbc6ace2b..00000000000
--- a/srcpkgs/choosenim/patches/ftbfs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 53472069126088cd1d23d84aa4fdee9dc780f7d2
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Dec 17 22:21:04 2019 +0100
-
-    fix build: undeclared identifier: 'NimbleError'
-
-diff --git choosenim.nimble choosenim.nimble
-index d826357..b91fac8 100644
---- choosenim.nimble
-+++ choosenim.nimble
-@@ -13,7 +13,7 @@ skipExt = @["nim"]
- 
- # Dependencies
- 
--requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
-+requires "nim >= 0.16.1", "nimble#5bb795a", "untar >= 0.1.0"
- requires "libcurl >= 1.0.0"
- requires "analytics >= 0.1.1"
- requires "osinfo >= 0.3.0"
-diff --git src/choosenim/common.nim src/choosenim/common.nim
-index 197bfac..059d210 100644
---- src/choosenim/common.nim
-+++ src/choosenim/common.nim
-@@ -1,4 +1,4 @@
--import nimblepkg/common
-+import nimblepkg/version
- 
- type
-   ChooseNimError* = object of NimbleError
-@@ -19,4 +19,4 @@ const
-     "g++",
-     "gdb",
-     "ld"
--  ]
-\ No newline at end of file
-+  ]
-diff --git src/choosenim/proxyexe.nim src/choosenim/proxyexe.nim
-index 9c9c761..829df8f 100644
---- src/choosenim/proxyexe.nim
-+++ src/choosenim/proxyexe.nim
-@@ -4,7 +4,7 @@
- 
- import strutils, os, osproc
- 
--import nimblepkg/[cli, options]
-+import nimblepkg/[cli, options, version]
- import nimblepkg/common as nimbleCommon
- import cliparams
- from common import ChooseNimError, mingwProxies
-@@ -71,4 +71,4 @@ when isMainModule:
- 
-     display("Info:", "If unexpected, please report this error to " &
-             "https://github.com/dom96/choosenim", Warning, HighPriority)
--    quit(1)
-\ No newline at end of file
-+    quit(1)
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
new file mode 100644
index 00000000000..a102f0c13b3
--- /dev/null
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -0,0 +1,103 @@
+diff --git choosenim.nimble choosenim.nimble
+index 7ba9b36..dc47faa 100644
+--- choosenim.nimble
++++ choosenim.nimble
+@@ -14,7 +14,7 @@ skipExt = @["nim"]
+ # Dependencies
+ 
+ requires "nim >= 1.2.6", "nimble#8f7af86"
+-requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
++requires "nimterop >= 0.6.12"
+ #requires "libcurl >= 1.0.0" - OSX now uses httpclient
+ requires "analytics >= 0.2.0"
+ requires "osinfo >= 0.3.0"
+diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
+index 1d45140..d5361e0 100644
+--- nimarchive/nimarchive/archive.nim
++++ nimarchive/nimarchive/archive.nim
+@@ -2,28 +2,6 @@ import os, strutils
+ 
+ import nimterop/[build, cimport]
+ 
+-const
+-  baseDir = getProjectCacheDir("nimarchive" / "libarchive")
+-
+-  defs = """
+-    archiveStatic
+-    archiveJBB
+-    archiveSetVer=3.4.3
+-
+-    iconvStatic
+-    iconvStd
+-    iconvJBB
+-    iconvSetVer=1.16.0
+-  """
+-
+-setDefines(defs.splitLines())
+-
+-getHeader(
+-  header = "archive.h",
+-  outdir = baseDir,
+-  jbburi = "LibArchive",
+-  jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
+-)
+ 
+ import iconv
+ 
+@@ -52,9 +30,7 @@ static:
+   cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
+ 
+ let
+-  archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
++  archivePath {.compileTime.} = "archive.h"
++  archiveEntryPath {.compileTime.} = "archive_entry.h"
+ 
+-when archiveStatic:
+-  cImport(@[archivePath, archiveEntryPath], recurse = true)
+-else:
+-  cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
++cImport(@[archivePath, archiveEntryPath], recurse = false)
+diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
+index d983398..4f61a5b 100644
+--- nimarchive/nimarchive/iconv.nim
++++ nimarchive/nimarchive/iconv.nim
+@@ -2,15 +2,3 @@ import os, strutils
+ 
+ import nimterop/build
+ 
+-const
+-  baseDir = getProjectCacheDir("nimarchive" / "iconv")
+-
+-getHeader(
+-  header = "iconv.h",
+-  dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
+-  conanuri = "libiconv",
+-  jbburi = "Libiconv",
+-  jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
+-  outdir = baseDir,
+-  conFlags = "--enable-static=yes --with-pic=yes"
+-)
+diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
+index f20b246..7576066 100644
+--- src/choosenimpkg/ssl.nim
++++ src/choosenimpkg/ssl.nim
+@@ -2,19 +2,3 @@ import strutils
+ 
+ import nimterop/[build, cimport]
+ 
+-# Download openssl from JuliaBinaryWrappers
+-setDefines(@[
+-  "cryptoJBB", "cryptoStatic"
+-])
+-
+-getHeader(
+-  "crypto.h",
+-  jbburi = "openssl",
+-  outdir = getProjectCacheDir("nimopenssl")
+-)
+-
+-const
+-  sslLPath = cryptoLPath.replace("crypto", "ssl")
+-
+-# Link static binaries
+-{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d31e065edf0..fb5e9152b22 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,20 +1,22 @@
 # Template file for 'choosenim'
 pkgname=choosenim
-version=0.4.0
+version=0.7.4
 revision=1
-hostmakedepends="git nim"
-makedepends="libressl-devel zlib-devel"
+hostmakedepends="git nim libressl-devel pkg-config"
+makedepends="libressl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/dom96/choosenim"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d7b04314666a3647c255f89031deabe53f8e281b6cfbf3a0848272fc1799c0f3
+distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
+ https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
+checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+ c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" libressl-devel"
-fi
+post_extract() {
+	mv ../nimarchive-0.5.4 nimarchive
+}
 
 do_build() {
 	local arch args
@@ -26,14 +28,28 @@ do_build() {
 		ppc64*)   arch=powerpc64;;
 		ppc*)     arch=powerpc;;
 	esac
+	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
+	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
+	LDFLAGS+=" -lrt -ldl"
+	: >nim.cfg
+	if [ -z "$CROSS_BUILD" ]; then
+		cat >>nim.cfg <<-EOF
+		gcc.options.always = "$CPPFLAGS $CFLAGS -pthread"
+		gcc.options.linker = "$LDFLAGS"
+		EOF
+	fi
 	if [ -n "$arch" ]; then
-		cat > nim.cfg <<EOF
-$arch.linux.gcc.exe = "$CC"
-$arch.linux.gcc.linkerexe = "$CC"
-EOF
+		cat >>nim.cfg <<-EOF
+		$arch.linux.gcc.exe = "$CC"
+		$arch.linux.gcc.linkerexe = "$CC"
+		$arch.linux.gcc.options.always = "$CPPFLAGS $CFLAGS -pthread"
+		$arch.linux.gcc.options.linker = "$LDFLAGS"
+		EOF
 		args="--cpu:$arch"
 	fi
-	nimble -y build -d:release --passC:-flto "$args"
+	ln -sf $XBPS_CROSS_BASE/usr/include/archive.h src
+	ln -sf $XBPS_CROSS_BASE/usr/include/archive_entry.h src
+	nimble -y build -d:release --passC:-flto "$args" --path:$wrksrc/nimarchive
 }
 
 do_install() {

From 74f89336578199ef96f5b8889773d50f7e771e02 Mon Sep 17 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, 19 Nov 2020 22:07:29 +0700
Subject: [PATCH 0130/3595] JAI: move to restricted

The license requires us to defend and indemnify Sun and its licensors.
---
 srcpkgs/JAI/template | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/JAI/template b/srcpkgs/JAI/template
index ce50a8c183c..2b7fcb61068 100644
--- a/srcpkgs/JAI/template
+++ b/srcpkgs/JAI/template
@@ -1,12 +1,21 @@
 # Template file for 'JAI'
 pkgname=JAI
 version=1.1.3
-revision=3
+revision=4
+archs="i686 x86_64"
 short_desc="Java Advanced Imaging Library - binary version"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
-license="Apache-2.0"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+license="custom:Oracle Binary Code License"
 homepage="https://java.net/projects/jai-core"
-archs="i686 x86_64"
+repository=nonfree
+# DISTRIBUTIONREADME-jai.txt
+# (e) You agree to defend and indemnify Sun and its licensors from and against
+# any damages, costs, liabilities, settlement amounts and/or expenses
+# (including attorneys' fees) incurred in connection with any claim, lawsuit or
+# action by any third party that arises or results from the use or distribution
+# of any and all Programs and/or Redistributable.
+restricted=yes
+ignore_elf_dirs="/usr/share/java/lib"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_arch="amd64"
@@ -32,5 +41,7 @@ do_install() {
 	vcopy lib/libmlib_jai.so usr/share/java/lib/${_jarch}
 	# put the license files in place
 	vmkdir usr/share/licenses/${pkgname}
-	vcopy *-jai.txt usr/share/licenses/${pkgname}
+	for _license in *.txt; do
+		vlicense "$_license"
+	done
 }

From 82e337f60f5e9600c3c9cdc53f210884cdb2a24d Mon Sep 17 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, 21 Nov 2020 09:29:10 +0700
Subject: [PATCH 0131/3595] katarakt: fix build for poppler-qt5 20.09.0

---
 .../katarakt/patches/not-an-octal-number.patch    | 15 +++++++++++++++
 srcpkgs/katarakt/template                         | 12 ++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/katarakt/patches/not-an-octal-number.patch

diff --git a/srcpkgs/katarakt/patches/not-an-octal-number.patch b/srcpkgs/katarakt/patches/not-an-octal-number.patch
new file mode 100644
index 00000000000..95b9f016951
--- /dev/null
+++ b/srcpkgs/katarakt/patches/not-an-octal-number.patch
@@ -0,0 +1,15 @@
+--- katarakt.pro.orig	2020-11-21 07:57:05.333858604 +0700
++++ katarakt.pro	2020-11-21 07:58:23.713527253 +0700
+@@ -17,9 +17,9 @@
+ 
+     isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config    # same as in link_pkgconfig.prf
+     POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+-    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+-    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+-    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed 's/^0*//' | sed 's/^$/0/')
++    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed 's/^0*//' | sed 's/^$/0/')
++    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed 's/^0*//' | sed 's/^$/0/')
+ 
+     DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+     DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
diff --git a/srcpkgs/katarakt/template b/srcpkgs/katarakt/template
index 48e528c8d97..13fc25ba662 100644
--- a/srcpkgs/katarakt/template
+++ b/srcpkgs/katarakt/template
@@ -1,23 +1,19 @@
 # Template file for 'katarakt'
 pkgname=katarakt
 version=0.2
-revision=2
+revision=3
 wrksrc="katarakt-v${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config asciidoc"
+hostmakedepends="qt5-qmake pkg-config asciidoc qt5-host-tools"
 makedepends="qt5-devel poppler-qt5-devel"
-short_desc="A simple PDF viewer"
+short_desc="Simple PDF viewer"
 maintainer="Lukas Braun <void-packages@moshbit.net>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://wwwcip.cs.fau.de/~go18gomu/katarakt"
 #distfiles="https://wwwcip.cs.fau.de/~go18gomu/katarakt/tarballs/katarakt-${version}.tar.xz"
 distfiles="https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v${version}/katarakt-v${version}.tar.gz"
 checksum=f60b3b7477975301a6c6657eb0a24d5cc28d321cca70e9746d4d1ea91e239c46
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
-
 post_build() {
 	make doc
 }

From b2c64e71888ef4765aaf6ea8f57c0c875747e7c1 Mon Sep 17 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, 21 Nov 2020 10:04:58 +0700
Subject: [PATCH 0132/3595] minisign: fix build

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

diff --git a/srcpkgs/minisign/template b/srcpkgs/minisign/template
index b502ceeaab2..f86361d85db 100644
--- a/srcpkgs/minisign/template
+++ b/srcpkgs/minisign/template
@@ -3,6 +3,7 @@ pkgname=minisign
 version=0.9
 revision=1
 build_style=cmake
+hostmakedepends="pkg-config"
 makedepends="libsodium-devel"
 short_desc="Simple tool to sign files and verify signatures"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 55a7ddcb3fa8cee0f3c02e5681658194cbadb72c Mon Sep 17 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, 21 Nov 2020 10:12:00 +0700
Subject: [PATCH 0133/3595] libgaminggear: fix build

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

diff --git a/srcpkgs/libgaminggear/template b/srcpkgs/libgaminggear/template
index e6a59c5281a..36ab8eccfea 100644
--- a/srcpkgs/libgaminggear/template
+++ b/srcpkgs/libgaminggear/template
@@ -15,6 +15,8 @@ homepage="https://sourceforge.net/projects/libgaminggear/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=ffbd59c62e3107b09ec99f1e5147529c61931987abc7f86a140449b46388c549
 
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
+
 libgaminggear-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} gtk+-devel libglib-devel

From 70cab730978fbb2c680fcfd67d388d002affb355 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Nov 2020 16:27:01 -0600
Subject: [PATCH 0134/3595] wine: update to 5.22.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 536e52e67ba..fc753289c02 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=5.21
+version=5.22
 revision=1
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
@@ -9,7 +9,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%%.*}.x/wine-${version}.tar.xz"
-checksum=5a1a5c2549d11bce0d6640220ed6fd31042afcbcb366f475e0ccb4781d2d2840
+checksum=09bd06c87c8c974e6ad34507cec875d7217eb56fc09df838d5453e0ebbce4d21
 
 lib32mode=full
 archs="i686 x86_64*"

From 3d022c52a2d0c176e002b8448baaffb577216a24 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Nov 2020 08:00:53 -0600
Subject: [PATCH 0135/3595] timeshift: update to 20.11.1.

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

diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index fb6bf744b94..9a01c60cf05 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,9 +1,8 @@
 # Template file for 'timeshift'
 pkgname=timeshift
-version=20.03
-revision=2
+version=20.11.1
+revision=1
 build_style=gnu-makefile
-conf_files="/etc/default/timeshift.json"
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
 depends="rsync psmisc"
@@ -12,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.teejeetech.in/p/timeshift.html"
 distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
-checksum=6516150481fc3e69c090ff25426e85d99d10035949446368918076b19335b391
+checksum=c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb
 
 # Remove hard-dep on crontab, leave up to user to decide
 post_extract() {

From 724219bd491aabdf09ae9a6fdecf242866aeeb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 00:29:32 -0300
Subject: [PATCH 0136/3595] rclone: update to 1.53.3.

Fixes CVE-2020-28924.
---
 srcpkgs/rclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 22c4857e669..3c7ea20e5bc 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.53.1
+version=1.53.3
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://rclone.org/"
 changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/changelog.md"
 distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=d72d74a90a191fc0964705270ff59d58094e2bf4982f9fa0bc150f7296620caf
+checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
 
 post_install() {
 	vlicense COPYING

From 48d1a89703df623bffdc43281b745acdafd79e1e Mon Sep 17 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, 21 Nov 2020 10:52:48 +0700
Subject: [PATCH 0137/3595] musikcube: fix build with libmicrohttpd 0.9.70

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

diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 78cf86fe80d..a3da40c134b 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -25,6 +25,10 @@ fi
 # SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
 makedepends+=" libglvnd"
 
+post_patch() {
+	vsed -i -e 's/00097000/00097001/' src/plugins/server/HttpServer.h
+}
+
 post_install() {
 	vlicense LICENSE.txt
 }

From bdb54728bafe67432c675c43a0f2964ed233905a Mon Sep 17 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, 16 Nov 2020 08:35:37 +0700
Subject: [PATCH 0138/3595] nss: update to 3.59.

---
 srcpkgs/nss/patches/fix-bug1672703.patch | 137 -----------------------
 srcpkgs/nss/template                     |   6 +-
 2 files changed, 3 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/fix-bug1672703.patch

diff --git a/srcpkgs/nss/patches/fix-bug1672703.patch b/srcpkgs/nss/patches/fix-bug1672703.patch
deleted file mode 100644
index 42347c8f91a..00000000000
--- a/srcpkgs/nss/patches/fix-bug1672703.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit b03a4fc5b902498414b02640dcb2717dfef9682f
-Author: Daiki Ueno <dueno@redhat.com>
-Date:   Mon Oct 26 06:46:11 2020 +0100
-
-    Bug 1672703, always tolerate the first CCS in TLS 1.3, r=mt
-    
-    Summary:
-    This flips the meaning of the flag for checking excessive CCS
-    messages, so it only rejects multiple CCS messages while the first CCS
-    message is always accepted.
-    
-    Reviewers: mt
-    
-    Reviewed By: mt
-    
-    Bug #: 1672703
-    
-    Differential Revision: https://phabricator.services.mozilla.com/D94603
----
- gtests/ssl_gtest/ssl_tls13compat_unittest.cc | 18 +++++++++---------
- lib/ssl/ssl3con.c                            | 20 +++++++-------------
- lib/ssl/sslimpl.h                            |  5 +----
- 3 files changed, 17 insertions(+), 26 deletions(-)
-
-diff --git gtests/ssl_gtest/ssl_tls13compat_unittest.cc gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-index dcede798cc..645f84ff02 100644
---- nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-+++ nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
-@@ -348,8 +348,8 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecBeforeClientHelloTwice) {
-   client_->CheckErrorCode(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT);
- }
- 
--// The server rejects a ChangeCipherSpec if the client advertises an
--// empty session ID.
-+// The server accepts a ChangeCipherSpec even if the client advertises
-+// an empty session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
-   EnsureTlsSetup();
-   ConfigureVersion(SSL_LIBRARY_VERSION_TLS_1_3);
-@@ -358,9 +358,8 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterClientHelloEmptySid) {
-   client_->Handshake();  // Send ClientHello
-   client_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));  // Send CCS
- 
--  server_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
--  server_->Handshake();  // Consume ClientHello and CCS
--  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+  Handshake();
-+  CheckConnected();
- }
- 
- // The server rejects multiple ChangeCipherSpec even if the client
-@@ -381,7 +380,7 @@ TEST_F(Tls13CompatTest, ChangeCipherSpecAfterClientHelloTwice) {
-   server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
- }
- 
--// The client rejects a ChangeCipherSpec if it advertises an empty
-+// The client accepts a ChangeCipherSpec even if it advertises an empty
- // session ID.
- TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
-   EnsureTlsSetup();
-@@ -398,9 +397,10 @@ TEST_F(TlsConnectStreamTls13, ChangeCipherSpecAfterServerHelloEmptySid) {
-                          // send ServerHello..CertificateVerify
-   // Send CCS
-   server_->SendDirect(DataBuffer(kCannedCcs, sizeof(kCannedCcs)));
--  client_->ExpectSendAlert(kTlsAlertUnexpectedMessage);
--  client_->Handshake();  // Consume ClientHello and CCS
--  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-+
-+  // No alert is sent from the client. As Finished is dropped, we
-+  // can't use Handshake() and CheckConnected().
-+  client_->Handshake();
- }
- 
- // The client rejects multiple ChangeCipherSpec in a row even if the
-diff --git lib/ssl/ssl3con.c lib/ssl/ssl3con.c
-index 767ffc30f1..b652dcea34 100644
---- nss/lib/ssl/ssl3con.c
-+++ nss/lib/ssl/ssl3con.c
-@@ -6645,11 +6645,7 @@ ssl_CheckServerSessionIdCorrectness(sslSocket *ss, SECItem *sidBytes)
- 
-     /* TLS 1.3: We sent a session ID.  The server's should match. */
-     if (!IS_DTLS(ss) && (sentRealSid || sentFakeSid)) {
--        if (sidMatch) {
--            ss->ssl3.hs.allowCcs = PR_TRUE;
--            return PR_TRUE;
--        }
--        return PR_FALSE;
-+        return sidMatch;
-     }
- 
-     /* TLS 1.3 (no SID)/DTLS 1.3: The server shouldn't send a session ID. */
-@@ -8696,7 +8692,6 @@ ssl3_HandleClientHello(sslSocket *ss, PRUint8 *b, PRUint32 length)
-                 errCode = PORT_GetError();
-                 goto alert_loser;
-             }
--            ss->ssl3.hs.allowCcs = PR_TRUE;
-         }
- 
-         /* TLS 1.3 requires that compression include only null. */
-@@ -13066,15 +13061,14 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Ciphertext *cText)
-             ss->ssl3.hs.ws != idle_handshake &&
-             cText->buf->len == 1 &&
-             cText->buf->buf[0] == change_cipher_spec_choice) {
--            if (ss->ssl3.hs.allowCcs) {
--                /* Ignore the first CCS. */
--                ss->ssl3.hs.allowCcs = PR_FALSE;
-+            if (!ss->ssl3.hs.rejectCcs) {
-+                /* Allow only the first CCS. */
-+                ss->ssl3.hs.rejectCcs = PR_TRUE;
-                 return SECSuccess;
-+            } else {
-+                alert = unexpected_message;
-+                PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-             }
--
--            /* Compatibility mode is not negotiated. */
--            alert = unexpected_message;
--            PORT_SetError(SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER);
-         }
- 
-         if ((IS_DTLS(ss) && !dtls13_AeadLimitReached(spec)) ||
-diff --git lib/ssl/sslimpl.h lib/ssl/sslimpl.h
-index 44c43a0e6c..35d0c2d6bc 100644
---- nss/lib/ssl/sslimpl.h
-+++ nss/lib/ssl/sslimpl.h
-@@ -710,10 +710,7 @@ typedef struct SSL3HandshakeStateStr {
-                                            * or received. */
-     PRBool receivedCcs;                   /* A server received ChangeCipherSpec
-                                            * before the handshake started. */
--    PRBool allowCcs;                      /* A server allows ChangeCipherSpec
--                                           * as the middlebox compatibility mode
--                                           * is explicitly indicarted by
--                                           * legacy_session_id in TLS 1.3 ClientHello. */
-+    PRBool rejectCcs;                     /* Excessive ChangeCipherSpecs are rejected. */
-     PRBool clientCertRequested;           /* True if CertificateRequest received. */
-     PRBool endOfFlight;                   /* Processed a full flight (DTLS 1.3). */
-     ssl3KEADef kea_def_mutable;           /* Used to hold the writable kea_def
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c755eb7fa33..635e67a610e 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,8 +3,8 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.58
-revision=2
+version=3.59
+revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
 depends="nspr>=${_nsprver}"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/projects/security/pki/nss"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0
+checksum=e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 1a8975d849fc93cfaac5279ef6379359640405de Mon Sep 17 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, 21 Nov 2020 13:44:03 +0700
Subject: [PATCH 0139/3595] notes-up: fix ftbfs vala 0.50

---
 srcpkgs/notes-up/patches/vala-0.50.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/notes-up/patches/vala-0.50.patch

diff --git a/srcpkgs/notes-up/patches/vala-0.50.patch b/srcpkgs/notes-up/patches/vala-0.50.patch
new file mode 100644
index 00000000000..3cb0a75b521
--- /dev/null
+++ b/srcpkgs/notes-up/patches/vala-0.50.patch
@@ -0,0 +1,18 @@
+--- vapi/libmarkdown.vapi.orig	2020-11-21 13:32:35.540125253 +0700
++++ vapi/libmarkdown.vapi	2020-11-21 13:40:04.961780640 +0700
+@@ -41,7 +41,7 @@
+ 	public void initialize ();
+ 	public void with_html5_tags ();
+ 	public void shlib_destructor ();
+-	public char markdown_version[];
++	public string markdown_version;
+ 
+ 	[Compact]
+ 	[CCode (cname = "MMIOT", cprefix = "mkd_", free_function = "mkd_cleanup")]
+@@ -125,4 +125,4 @@
+ 		NOSTYLE,
+ 		EMBED
+ 	}
+-}
+\ No newline at end of file
++}

From 039bde35305ace42e713f001d6d5f5735c52d93a Mon Sep 17 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, 21 Nov 2020 14:09:06 +0700
Subject: [PATCH 0140/3595] olsrd: fix ftbfs

---
 srcpkgs/olsrd/patches/bison-header.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/olsrd/patches/bison-header.patch

diff --git a/srcpkgs/olsrd/patches/bison-header.patch b/srcpkgs/olsrd/patches/bison-header.patch
new file mode 100644
index 00000000000..882edeef007
--- /dev/null
+++ b/srcpkgs/olsrd/patches/bison-header.patch
@@ -0,0 +1,10 @@
+--- src/cfgparser/local.mk.orig	2020-11-21 14:03:26.244348554 +0700
++++ src/cfgparser/local.mk	2020-11-21 14:06:09.976236365 +0700
+@@ -77,6 +77,7 @@
+ 	$(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
+ 	$(MAKECMDPREFIX)sed	-e 's/register //' \
+ 		-e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
++		-e '/include.*h-tmp/s/-tmp"$$/"/' \
+ 		< "$@-tmp" >"$@"
+ 	$(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
+ 	$(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"

From 3f29eb2a5b575e463082626a517e4cae2db85159 Mon Sep 17 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, 21 Nov 2020 16:04:43 +0700
Subject: [PATCH 0141/3595] pulseview: fix build with qt 5.15

---
 srcpkgs/pulseview/patches/qt-5.15.patch | 20 ++++++++++++++++++++
 srcpkgs/pulseview/template              |  6 +-----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/pulseview/patches/qt-5.15.patch

diff --git a/srcpkgs/pulseview/patches/qt-5.15.patch b/srcpkgs/pulseview/patches/qt-5.15.patch
new file mode 100644
index 00000000000..986ed098ab5
--- /dev/null
+++ b/srcpkgs/pulseview/patches/qt-5.15.patch
@@ -0,0 +1,20 @@
+--- pv/util.cpp.orig	2020-11-21 15:56:56.690899190 +0700
++++ pv/util.cpp	2020-11-21 16:00:40.981375801 +0700
+@@ -137,7 +137,7 @@
+ 	QString s;
+ 	QTextStream ts(&s);
+ 	if (sign && !v.is_zero())
+-		ts << forcesign;
++		Qt::forcesign(ts);
+ 	ts << qSetRealNumberPrecision(precision) << (v * multiplier);
+ 	ts << ' ' << prefix << unit;
+ 
+@@ -175,7 +175,7 @@
+ 	QString s;
+ 	QTextStream ts(&s);
+ 	if (sign && (v != 0))
+-		ts << forcesign;
++		Qt::forcesign(ts);
+ 	ts.setRealNumberNotation(QTextStream::FixedNotation);
+ 	ts.setRealNumberPrecision(precision);
+ 	ts << (v * multiplier) << ' ' << prefix << unit;
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 975b69054ac..83ce80bc39d 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -4,7 +4,7 @@ version=0.4.2
 revision=1
 build_style=cmake
 configure_args="-DDISABLE_WERROR=TRUE"
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="glib-devel libzip-devel glibmm-devel qt5-devel
  qt5-svg-devel qt5-tools-devel boost-devel libsigrok-devel
  libsigrokdecode-devel"
@@ -16,8 +16,4 @@ homepage="https://sigrok.org/"
 distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 CXXFLAGS+=" -fext-numeric-literals"

From bcb245db49309240bb76892cf22bfb51f5cef95a Mon Sep 17 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, 21 Nov 2020 16:22:41 +0700
Subject: [PATCH 0142/3595] qtikz: use SPDX 3.0 license, fix build Qt 5.15

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

diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 490b0c183d9..a724860cc42 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -1,15 +1,20 @@
 # Template file for 'qtikz'
 pkgname=qtikz
 version=0.12
-revision=1
+revision=2
 wrksrc=ktikz-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-devel
+hostmakedepends="qt5-qmake pkg-config qt5-plugin-sqlite qt5-host-tools
  qt5-tools"
 makedepends="poppler-qt5-devel qt5-devel"
 short_desc="Editor for graphics set in TikZ"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
 distfiles="https://github.com/fhackenberger/ktikz/archive/${version}.tar.gz"
 checksum=ef15fe70f4e057eab74ed738886f8e4a53d5b1bcdf1ee329930bf06e22f56e9d
+
+post_patch() {
+	vsed -e '/include.*QPainter/a #include <QtGui/QPainterPath>' \
+		-i app/tikzeditor.cpp
+}

From c7b51289e7147d69a4fb3e54a75b6745a497405e Mon Sep 17 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, 21 Nov 2020 16:31:36 +0700
Subject: [PATCH 0143/3595] abcde: remove noarch

---
 srcpkgs/abcde/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/abcde/template b/srcpkgs/abcde/template
index 49fe4f97768..d42020e308f 100644
--- a/srcpkgs/abcde/template
+++ b/srcpkgs/abcde/template
@@ -1,8 +1,7 @@
 # Template file for 'abcde'
 pkgname=abcde
 version=2.9.3
-revision=1
-archs=noarch
+revision=2
 conf_files="/etc/${pkgname}.conf"
 depends="cd-discid perl-MusicBrainz-DiscID perl-WebService-MusicBrainz vorbis-tools"
 short_desc="CLI audio CD encoder and tagger"

From 809391c36470d45740935214bd8183eaf3a25d43 Mon Sep 17 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, 21 Nov 2020 16:31:36 +0700
Subject: [PATCH 0144/3595] acpilight: remove noarch

---
 srcpkgs/acpilight/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/acpilight/template b/srcpkgs/acpilight/template
index 89236bd4c3f..40467c506ea 100644
--- a/srcpkgs/acpilight/template
+++ b/srcpkgs/acpilight/template
@@ -1,8 +1,7 @@
 # Template file for 'acpilight'
 pkgname=acpilight
 version=1.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="acpilight-v${version}"
 depends="python3"
 short_desc="Backward-compatibile xbacklight replacement"

From aa3787fc71cd3efc44105e8f2bf7d6cda93eadf3 Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0145/3595] acr: remove noarch

---
 srcpkgs/acr/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template
index 773799454b6..b2090f67f32 100644
--- a/srcpkgs/acr/template
+++ b/srcpkgs/acr/template
@@ -1,8 +1,7 @@
 # Template file for 'acr'
 pkgname=acr
 version=1.9.3
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 short_desc="AutoConf Replacement"
 maintainer="Felipe Nogueira <contato.fnog@gmail.com>"

From ddbc01fa842c44e933c863ea682b877a80200a8f Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0146/3595] adapta-kde: remove noarch

---
 srcpkgs/adapta-kde/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/adapta-kde/template b/srcpkgs/adapta-kde/template
index 1fc16324be1..f2b427b358e 100644
--- a/srcpkgs/adapta-kde/template
+++ b/srcpkgs/adapta-kde/template
@@ -1,8 +1,7 @@
 # Template file for 'adapta-kde'
 pkgname=adapta-kde
 version=20180828
-revision=1
-archs=noarch
+revision=2
 short_desc="Port of the popular GTK theme Adapta for Plasma 5 desktop"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"

From 07627e13cc856190fab3a737215b1d0374c47b84 Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0147/3595] adwaita-plus: remove noarch

---
 srcpkgs/adwaita-plus/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/adwaita-plus/template b/srcpkgs/adwaita-plus/template
index c5faf56aeb2..5d861183516 100644
--- a/srcpkgs/adwaita-plus/template
+++ b/srcpkgs/adwaita-plus/template
@@ -1,8 +1,7 @@
 # Template file for 'adwaita-plus'
 pkgname=adwaita-plus
 version=5.0
-revision=1
-archs=noarch
+revision=2
 short_desc="Modern third-party icons theme based on GNOME's Adwaita"
 maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
 license="GPL-3.0-or-later"

From 9e93d96ccad94a1b4ebeadd926c390655888fb7c Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0148/3595] alacritty: remove noarch

---
 srcpkgs/alacritty/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 74ddfcd6d65..86626f44080 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
 # Template file for 'alacritty'
 pkgname=alacritty
 version=0.5.0
-revision=1
+revision=2
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -28,7 +28,6 @@ post_install() {
 
 alacritty-terminfo_package() {
 	short_desc+=" - terminfo data"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/terminfo
 	}

From 53790cf68de13c6ed3cecbd22203d08d03637c48 Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0149/3595] albatross-themes: remove noarch

---
 srcpkgs/albatross-themes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/albatross-themes/template b/srcpkgs/albatross-themes/template
index ca8ff1b363c..ce8a344c343 100644
--- a/srcpkgs/albatross-themes/template
+++ b/srcpkgs/albatross-themes/template
@@ -1,8 +1,7 @@
 # Template file for 'albatross-themes'
 pkgname=albatross-themes
 version=1.7.4
-revision=2
-archs=noarch
+revision=3
 build_style=fetch
 depends="gtk+"
 short_desc="Elegant black GTK2/3/Metacity/Xfwm theme"

From aa0f91c1e65b305e6aa107c0ebadf0c99c62204f Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0150/3595] angrysearch: remove noarch

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

diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template
index 88a6954ac85..96b6b6604ba 100644
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@@ -1,19 +1,18 @@
 # Template file for 'angrysearch'
 pkgname=angrysearch
 version=1.0.1
-revision=2
+revision=3
 wrksrc="ANGRYsearch-${version}"
+pycompile_dirs="usr/share/angrysearch"
 hostmakedepends="python3"
 depends="python3-PyQt5 xdg-utils"
-archs=noarch
 short_desc="Instant file search"
 maintainer="DirectorX <void.directorx@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/dotheevo/angrysearch/"
-python_version=3
-pycompile_dirs="usr/share/angrysearch"
 distfiles="http://github.com/dotheevo/${pkgname}/archive/v${version}.tar.gz"
 checksum=9a550649c3efafb26660860758f2e75702ce96a0a0c50dc34ced2967b51a843f
+python_version=3
 
 do_install() {
 	vinstall angrysearch.desktop 644 "usr/share/applications"

From 3e498e642b4ebe58f02e9debc08817bcd1606c1c Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0151/3595] ansi: remove noarch

---
 srcpkgs/ansi/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template
index be114d5203b..acc41f9251c 100644
--- a/srcpkgs/ansi/template
+++ b/srcpkgs/ansi/template
@@ -1,8 +1,7 @@
 # Template file for 'ansi'
 pkgname=ansi
 version=2.0.4
-revision=1
-archs=noarch
+revision=2
 depends="bash"
 short_desc="ANSI escape codes in pure Bash"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5fb1753d43d97dcfe9eb4551c2842a53e668e578 Mon Sep 17 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, 21 Nov 2020 16:31:37 +0700
Subject: [PATCH 0152/3595] antlr3-bin: remove noarch

---
 srcpkgs/antlr3-bin/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/antlr3-bin/template b/srcpkgs/antlr3-bin/template
index 305df8ae69e..e6725f610ab 100644
--- a/srcpkgs/antlr3-bin/template
+++ b/srcpkgs/antlr3-bin/template
@@ -1,8 +1,7 @@
 # Template file for 'antlr3-bin'
 pkgname=antlr3-bin
 version=3.4
-revision=1
-archs=noarch
+revision=2
 build_style=fetch
 depends="virtual?java-runtime"
 short_desc="Parser generator for C++, C#, Java, and Python"

From d6267fab93f3bd44a6c99f927ea75ef955dba9c9 Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0153/3595] apache-ant: remove noarch

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

diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template
index 80a738985a0..a4ec359fe20 100644
--- a/srcpkgs/apache-ant/template
+++ b/srcpkgs/apache-ant/template
@@ -1,15 +1,14 @@
 # Template file for 'apache-ant'
 pkgname=apache-ant
 version=1.10.8
-revision=1
-archs=noarch
+revision=2
 hostmakedepends="openjdk8"
 depends="virtual?java-runtime"
 short_desc="Java library and command-line tool that help building software"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
-homepage="http://ant.apache.org"
-distfiles="http://mirror.dkd.de/apache/ant/source/apache-ant-${version}-src.tar.xz"
+homepage="https://ant.apache.org"
+distfiles="https://archive.apache.org/dist/ant/source/apache-ant-${version}-src.tar.xz"
 checksum=40570314bad3b46abe4ee0669a8f8feb56fe767f1642a801fa7fd4fafcd362ca
 python_version=2 # only script uses python2-isms like print ""
 
@@ -42,7 +41,6 @@ do_install() {
 apache-ant-doc_package() {
 	short_desc+=" - documentation"
 	depends="${sourcepkg}>=${version}_${revision}"
-	archs=noarch
 	pkg_install() {
 		vmove $_prefix/manual
 	}

From 8f726c0f7b4de28c276a017eab83138c582a58ed Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0154/3595] apache-storm: remove noarch

---
 srcpkgs/apache-storm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index 6ae346a0557..bcb06f4ee08 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -1,8 +1,7 @@
 # Template file for 'apache-storm'
 pkgname=apache-storm
 version=2.2.0
-revision=2
-archs=noarch
+revision=3
 depends="virtual?java-runtime python3 bash"
 short_desc="Distributed realtime computation system"
 maintainer="bougyman <bougyman@voidlinux.org>"

From ba9d691227af7b594039d78af495c54d379781a4 Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0155/3595] archlabs-themes: remove noarch

---
 srcpkgs/archlabs-themes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/archlabs-themes/template b/srcpkgs/archlabs-themes/template
index aa648d35457..95f056e6d4e 100644
--- a/srcpkgs/archlabs-themes/template
+++ b/srcpkgs/archlabs-themes/template
@@ -1,10 +1,9 @@
 # Template file for 'archlabs-themes'
 pkgname=archlabs-themes
 version=20180503
-revision=2
+revision=3
 _commit=73d0900117daefedf6c76dd0e71538bb954f1b10
 wrksrc="ArchLabs-Themes-${_commit}"
-archs=noarch
 depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
 short_desc="Themes used in ArchLabs"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7912d1a0e0032d36a61c15d08152a7988dd9712b Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0156/3595] argtable: remove noarch

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

diff --git a/srcpkgs/argtable/template b/srcpkgs/argtable/template
index 7083e703a50..b283361b889 100644
--- a/srcpkgs/argtable/template
+++ b/srcpkgs/argtable/template
@@ -1,12 +1,12 @@
 # Template file for 'argtable'
 pkgname=argtable
 version=2.13
-revision=1
+revision=2
 wrksrc="${pkgname}${version//./-}"
 build_style=gnu-configure
 short_desc="ANSI C command line parser"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v2"
+license="LGPL-2.0-or-later"
 homepage="http://argtable.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/argtable/argtable2-13.tar.gz"
 checksum=8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf
@@ -26,7 +26,6 @@ argtable-devel_package() {
 argtable-doc_package() {
 	short_desc+=" - documentation"
 	depends="${sourcepkg}>=${version}_${revision}"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 5b21dd5e2baa660139ab039f02967cb63168f1f7 Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0157/3595] asciiquarium: remove noarch

---
 srcpkgs/asciiquarium/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/asciiquarium/template b/srcpkgs/asciiquarium/template
index 128674e7a6e..32de4aca596 100644
--- a/srcpkgs/asciiquarium/template
+++ b/srcpkgs/asciiquarium/template
@@ -1,8 +1,7 @@
 # Template file for 'asciiquarium'
 pkgname=asciiquarium
 version=1.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="${pkgname}_${version}"
 depends="perl perl-Term-Animation perl-Curses"
 short_desc="Enjoy the mysteries of the sea from the safety of your own terminal"

From 97d241724abe026e741fdaeeaf2d7ee74edb56cb Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0158/3595] aspell-ru: remove noarch

---
 srcpkgs/aspell-ru/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/aspell-ru/template b/srcpkgs/aspell-ru/template
index f0a6d0fa52d..c6592338f38 100644
--- a/srcpkgs/aspell-ru/template
+++ b/srcpkgs/aspell-ru/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell-ru'
 pkgname=aspell-ru
 version=0.99f7
-revision=2
+revision=3
 wrksrc="aspell6-ru-${version}-1"
 build_style=configure
 hostmakedepends="aspell-devel which"
@@ -14,7 +14,6 @@ checksum=5c29b6ccce57bc3f7c4fb0510d330446b9c769e59c92bdfede27333808b6e646
 
 words-ru_package() {
 	short_desc="Russian dictionary word list"
-	archs=noarch
 	pkg_install() {
 		vmkdir usr/share/dict
 		precat *.cwl |

From 7e82bfaca94c5fc5102d20fc3397f1637e916ad5 Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0159/3595] astromenace: remove noarch

---
 srcpkgs/astromenace-data     |  1 -
 srcpkgs/astromenace/template | 13 ++-----------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/astromenace-data

diff --git a/srcpkgs/astromenace-data b/srcpkgs/astromenace-data
deleted file mode 120000
index 6c0834e519d..00000000000
--- a/srcpkgs/astromenace-data
+++ /dev/null
@@ -1 +0,0 @@
-astromenace
\ No newline at end of file
diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template
index ae6bbc38330..5008426e40b 100644
--- a/srcpkgs/astromenace/template
+++ b/srcpkgs/astromenace/template
@@ -1,19 +1,19 @@
 # Template file for 'astromenace'
 pkgname=astromenace
 version=1.4.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDATADIR=/usr/share/astromenace -DDONTCREATEVFS=TRUE"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
  fontconfig-devel freetype-devel libXinerama-devel"
-depends="astromenace-data>=${version}_${revision}"
 short_desc="Hardcore 3D space shooter"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
 homepage="http://www.viewizard.com/"
 distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
 checksum=0aca5211c9f333acf698807f597e5ad8e9d1455ba8ad202940890bff5b6c9507
+replaces="astromenace-data>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/GL"
@@ -31,12 +31,3 @@ do_install() {
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 	vinstall share/astromenace.appdata.xml 644 usr/share/appdata
 }
-
-astromenace-data_package() {
-	short_desc+=" - data file"
-	archs=noarch
-	pkg_install() {
-		vmkdir usr/share/astromenace
-		vcopy ${wrksrc}/gamedata usr/share/astromenace
-	}
-}

From b90eaf8737c4d1d09e93b87ded893aee1e38e0c1 Mon Sep 17 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, 21 Nov 2020 16:31:38 +0700
Subject: [PATCH 0160/3595] asus-kbd-backlight: remove noarch

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

diff --git a/srcpkgs/asus-kbd-backlight/template b/srcpkgs/asus-kbd-backlight/template
index e58e8341650..a3d116b0539 100644
--- a/srcpkgs/asus-kbd-backlight/template
+++ b/srcpkgs/asus-kbd-backlight/template
@@ -1,13 +1,12 @@
 # Template file for 'asus-kbd-backlight'
 pkgname=asus-kbd-backlight
 version=1.2
-revision=1
+revision=2
 create_wrksrc=yes
-archs=noarch
 depends="bash"
 short_desc="Helper for adjusting keyboard backlight brightness in Asus Zenbook"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="FDL1.3"
+license="GFDL-1.3-or-later"
 homepage="https://wiki.archlinux.org/index.php/ASUS_Zenbook_Prime_UX31A#keyboard_backlight_script"
 
 do_install() {

From 3fd619eff86c1b3f802c424e22fd0d7d9cf972e7 Mon Sep 17 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 0161/3595] atool: remove noarch

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

diff --git a/srcpkgs/atool/template b/srcpkgs/atool/template
index 56264dd3e16..6e20f366e7e 100644
--- a/srcpkgs/atool/template
+++ b/srcpkgs/atool/template
@@ -1,12 +1,11 @@
 # Template file for 'atool'
 pkgname=atool
 version=0.39.0
-revision=5
-archs=noarch
+revision=6
 build_style=gnu-configure
 hostmakedepends="perl"
 depends="perl"
-short_desc="A script for managing file archives of various types"
+short_desc="Script for managing file archives of various types"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/atool/"

From 515cfd326996629462545ab0449ccfed5528e4c2 Mon Sep 17 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 0162/3595] auto-auto-complete: remove noarch

---
 srcpkgs/auto-auto-complete/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/auto-auto-complete/template b/srcpkgs/auto-auto-complete/template
index 2fa45c4fc47..065d615c2b5 100644
--- a/srcpkgs/auto-auto-complete/template
+++ b/srcpkgs/auto-auto-complete/template
@@ -1,8 +1,7 @@
 # Template file for 'auto-auto-complete'
 pkgname=auto-auto-complete
 version=7.2
-revision=4
-archs=noarch
+revision=5
 build_style=gnu-makefile
 hostmakedepends="python3 texinfo"
 depends="python3"

From d487d002ec78f9faa2ef5c9da39b0a88d9ff465d Mon Sep 17 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 0163/3595] autojump: remove noarch

---
 srcpkgs/autojump/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/autojump/template b/srcpkgs/autojump/template
index 2448a2dd894..5b17e447df4 100644
--- a/srcpkgs/autojump/template
+++ b/srcpkgs/autojump/template
@@ -1,8 +1,7 @@
 # Template file for 'autojump'
 pkgname=autojump
 version=22.5.3
-revision=2
-archs=noarch
+revision=3
 wrksrc="${pkgname}-release-v${version}"
 hostmakedepends="python3"
 depends="python3"

From 53de83485aa75c5a2f36577de0e3e1b908b101ef Mon Sep 17 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, 21 Nov 2020 16:31:39 +0700
Subject: [PATCH 0164/3595] awoken-icons: remove noarch

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

diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
index f52c4f48187..c2d159acc08 100644
--- a/srcpkgs/awoken-icons/template
+++ b/srcpkgs/awoken-icons/template
@@ -1,13 +1,13 @@
 # Template file for 'awoken-icons'
 pkgname=awoken-icons
 version=2.5.2
-revision=4
-archs=noarch
+revision=5
 wrksrc=AwOken-2.5
 hostmakedepends="unzip"
 short_desc="Simple and quite complete icon set, Token-style"
 maintainer="Steven R <dev@styez.com>"
-license="CCPL:by-sa"
+# https://github.com/alecive/FlatWoken
+license="CC-BY-SA-4.0"
 homepage="http://alecive.deviantart.com/art/AwOken-163570862"
 distfiles="https://dl.dropbox.com/s/p3hfu7jw3vv7os9/AwOken-2.5.zip"
 checksum=d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e
@@ -39,7 +39,6 @@ do_install() {
 awoken-icons-dark_package() {
 	depends="awoken-icons>=${version}"
 	short_desc+=" - Dark icons"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/icons/AwOkenDark
 	}
@@ -48,7 +47,6 @@ awoken-icons-dark_package() {
 awoken-icons-white_package() {
 	depends="awoken-icons>=${version}"
 	short_desc+=" - White icons"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/icons/AwOkenWhite
 	}

From 610fa7243687c729969dd173e0a3f7d1fd1bbc72 Mon Sep 17 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 0165/3595] b43-firmware-classic: remove noarch

---
 srcpkgs/b43-firmware-classic/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/b43-firmware-classic/template b/srcpkgs/b43-firmware-classic/template
index b38e6ac7ee6..80459fc2b71 100644
--- a/srcpkgs/b43-firmware-classic/template
+++ b/srcpkgs/b43-firmware-classic/template
@@ -1,8 +1,7 @@
 # Template file for 'b43-firmware-classic'
 pkgname=b43-firmware-classic
 version=5.100.138
-revision=1
-archs=noarch
+revision=2
 wrksrc="broadcom-wl-${version}"
 hostmakedepends="b43-fwcutter"
 short_desc="Firmware for Broadcom B43 wireless (trusted release)"

From 9d4eaa4d52aa35e52d913fe4fbba7fe934862ca1 Mon Sep 17 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 0166/3595] b43-firmware: remove noarch

---
 srcpkgs/b43-firmware/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/b43-firmware/template b/srcpkgs/b43-firmware/template
index e5f894b81e7..a527b48f94a 100644
--- a/srcpkgs/b43-firmware/template
+++ b/srcpkgs/b43-firmware/template
@@ -1,8 +1,7 @@
 # Template file for 'b43-firmware'
 pkgname=b43-firmware
 version=6.30.163.46
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname}"
 create_wrksrc=yes
 hostmakedepends="b43-fwcutter"

From b16d37b2833b23edc2715b382f6dfa451c98c5d4 Mon Sep 17 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 0167/3595] bash-preexec: remove noarch

---
 srcpkgs/bash-preexec/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template
index 771ff0426ff..71a5f696c12 100644
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@@ -1,8 +1,7 @@
 # Template file for 'bash-preexec'
 pkgname=bash-preexec
 version=0.3.7
-revision=1
-archs=noarch
+revision=2
 depends="bash"
 short_desc="Preexec and Precmd functions for Bash just like Zsh"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From db64ee0bfed511cebbe0b1a67bb865ca0e37ff54 Mon Sep 17 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 0168/3595] bats: remove noarch

---
 srcpkgs/bats/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bats/template b/srcpkgs/bats/template
index 890b0d14e54..ee85a77bb19 100644
--- a/srcpkgs/bats/template
+++ b/srcpkgs/bats/template
@@ -1,8 +1,7 @@
 # Template file for 'bats'
 pkgname=bats
 version=1.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="bats-core-${version}"
 depends="bash"
 short_desc="Bash Automated Testing System"

From a7598b220c87cbc7c1f4caaf7821916447d842dc Mon Sep 17 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 0169/3595] beard: remove noarch

---
 srcpkgs/beard/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/beard/template b/srcpkgs/beard/template
index 93d69607399..306a6394e56 100644
--- a/srcpkgs/beard/template
+++ b/srcpkgs/beard/template
@@ -1,8 +1,7 @@
 # Template file for 'beard'
 pkgname=beard
 version=0.3
-revision=1
-archs=noarch
+revision=2
 short_desc="Simple hibernation daemon"
 maintainer="Samantha Baldwin <fuhsaz+void@cryptic.li>"
 license="Unlicense"

From d888147a68968ed9a4fd12085a8f46445f32bea5 Mon Sep 17 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, 21 Nov 2020 17:20:11 +0700
Subject: [PATCH 0170/3595] betterlockscreen: remove noarch

---
 srcpkgs/betterlockscreen/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c38dd536e77..c0e5d710f15 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,8 +1,7 @@
 # Template file for 'betterlockscreen'
 pkgname=betterlockscreen
 version=3.0.1
-revision=2
-archs=noarch
+revision=3
 depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
 short_desc="Sweet looking lockscreen for linux system"
 maintainer="Aleksander Zien <Aleks@nderZien.com>"

From c3d20e2a73192cc245449e6b4ce05815017d63e6 Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0171/3595] biosdisk: remove noarch

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

diff --git a/srcpkgs/biosdisk/template b/srcpkgs/biosdisk/template
index 324d249d36c..0b22e56f313 100644
--- a/srcpkgs/biosdisk/template
+++ b/srcpkgs/biosdisk/template
@@ -1,18 +1,13 @@
 # Template file for 'biosdisk'
 pkgname=biosdisk
 version=1.01
-revision=1
+revision=2
+archs="i686* x86_64*"
 build_style=gnu-makefile
-archs=noarch
 depends="syslinux wget cdrtools"
 short_desc="Utility for creating Dell BIOS flash disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 homepage="https://github.com/dell/biosdisk"
 distfiles="https://github.com/dell/biosdisk/archive/${version}.tar.gz"
 checksum=e89cf680914ab3d5bbb549c124c6c29594ef495880befc0d059ec8a3aaf1e3e7
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
-	*) broken="only for x86";;
-esac

From e25907f18fe66812c232dcb6b4e98d242cc50c88 Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0172/3595] bitfighter: remove noarch

---
 srcpkgs/bitfighter-data     |  1 -
 srcpkgs/bitfighter/template | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/bitfighter-data

diff --git a/srcpkgs/bitfighter-data b/srcpkgs/bitfighter-data
deleted file mode 120000
index 0ed1e91d70b..00000000000
--- a/srcpkgs/bitfighter-data
+++ /dev/null
@@ -1 +0,0 @@
-bitfighter
\ No newline at end of file
diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template
index a91443cbc3c..c3b2cc22a26 100644
--- a/srcpkgs/bitfighter/template
+++ b/srcpkgs/bitfighter/template
@@ -1,7 +1,7 @@
 # Template file for 'bitfighter'
 pkgname=bitfighter
 version=019g
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMASTER_MINIMAL=1 -DLUAJIT_BUILTIN=OFF"
 hostmakedepends="pkg-config unzip"
@@ -9,7 +9,7 @@ makedepends="boost-devel MesaLib-devel SDL2-devel LuaJIT-devel
  libopenal-devel libmariadbclient-devel libmodplug-devel
  libpng-devel libtomcrypt-devel speex-devel
  clipper-devel alure-devel"
-depends="desktop-file-utils libmpg123 bitfighter-data"
+depends="desktop-file-utils libmpg123"
 short_desc="Fast-paced team-based outer-space multi-player arcade game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -18,18 +18,11 @@ distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz
  http://bitfighter.org/files/classic_level_pack.zip"
 checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427
  d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
-python_version=2 #unverified
+python_version=2
+replaces="bitfighter-data>=0"
 
 CXXFLAGS="-Wno-narrowing"
 
 post_install() {
 	vcopy ../classic_level_pack/* usr/share/bitfighter/levels
 }
-
-bitfighter-data_package() {
-	short_desc+=" - classic level pack"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/bitfighter
-	}
-}

From ca87f1a576b2f24ed729aecfc912e96bdc914249 Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0173/3595] blackbird-themes: remove noarch

---
 srcpkgs/blackbird-themes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/blackbird-themes/template b/srcpkgs/blackbird-themes/template
index 0e4de2ad703..68ced568cbc 100644
--- a/srcpkgs/blackbird-themes/template
+++ b/srcpkgs/blackbird-themes/template
@@ -1,8 +1,7 @@
 # Template file for 'blackbird-themes'
 pkgname=blackbird-themes
 version=0.4
-revision=3
-archs=noarch
+revision=4
 build_style=fetch
 depends="gtk+"
 short_desc="Elegant dark GTK2/3/Metacity/Xfwm theme"

From fc8a31dc82ddab1a738f90cb958a0fb0c4521329 Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0174/3595] blackbox: remove noarch

---
 srcpkgs/blackbox/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template
index cc7fbdc68b0..e0d94abf4a5 100644
--- a/srcpkgs/blackbox/template
+++ b/srcpkgs/blackbox/template
@@ -1,8 +1,7 @@
 # Template file for 'blackbox'
 pkgname=blackbox
 version=1.20181219
-revision=1
-archs=noarch
+revision=2
 depends="bash"
 short_desc="Safely store secrets in Git/Mercurial/Subversion"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"

From f161615fc2564d0723fb475956c4adcc4b8cda5e Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0175/3595] blazeblogger: remove noarch

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

diff --git a/srcpkgs/blazeblogger/template b/srcpkgs/blazeblogger/template
index 0eb8d776fc8..df2c50a91a9 100644
--- a/srcpkgs/blazeblogger/template
+++ b/srcpkgs/blazeblogger/template
@@ -1,15 +1,14 @@
 # Template file for 'blazeblogger'
 pkgname=blazeblogger
 version=1.2.0
-revision=2
-archs=noarch
+revision=3
 hostmakedepends="perl"
 depends="perl"
 short_desc="CLI blogging CMS"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://blaze.blackened.cz/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/blazeblogger/blazeblogger-1.2.0.tar.gz"
+distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/blazeblogger/blazeblogger-$version.tar.gz"
 checksum=39024b70708be6073e8aeb3943eb3b73d441fbb7b8113e145c0cf7540c4921aa
 
 do_install() {

From 0ecf988188697204cb9efdc15dc44c0af43de8be Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0176/3595] bluebird-themes: remove noarch

---
 srcpkgs/bluebird-themes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index 47034af481c..ad67f8bc960 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -1,8 +1,7 @@
 # Template file for 'bluebird-themes'
 pkgname=bluebird-themes
 version=1.3
-revision=1
-archs=noarch
+revision=2
 build_style=fetch
 depends="gtk+"
 short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"

From f6e0fa5a9f7315abd9e9efbd380c0dc230fa2be8 Mon Sep 17 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, 21 Nov 2020 17:20:12 +0700
Subject: [PATCH 0177/3595] breeze-cursors: remove noarch

---
 srcpkgs/breeze-cursors/template | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/srcpkgs/breeze-cursors/template b/srcpkgs/breeze-cursors/template
index 579ad8ffaa8..f1a95c1d113 100644
--- a/srcpkgs/breeze-cursors/template
+++ b/srcpkgs/breeze-cursors/template
@@ -1,8 +1,7 @@
 # Template file for 'breeze-cursors'
 pkgname=breeze-cursors
 version=1.0
-revision=2
-archs=noarch
+revision=3
 create_wrksrc=yes
 build_style=meta
 depends="breeze-amber-cursor-theme
@@ -56,49 +55,42 @@ do_install() {
 }
 
 breeze-amber-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Amber cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Amber
 	}
 }
 breeze-blue-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Blue cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Blue
 	}
 }
 breeze-contrast-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Contrast cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Contrast
 	}
 }
 breeze-hacked-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Hacked cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Hacked
 	}
 }
 breeze-obsidian-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Obsidian cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Obsidian
 	}
 }
 breeze-purple-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Purple cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Purple
 	}
 }
 breeze-red-cursor-theme_package() {
-	archs=noarch
 	short_desc="Breeze Red cursor theme"
 	pkg_install() {
 		vmove usr/share/icons/Breeze_Red

From b03ef4eb81d0fa784c2e355ef230861128d6cb41 Mon Sep 17 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 0178/3595] broadcom-bt-firmware: remove noarch

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

diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 8aeef706d15..2345f00f7a5 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -1,9 +1,8 @@
 # Template file for 'broadcom-bt-firmware'
 pkgname=broadcom-bt-firmware
 version=12.0.1.1105
-revision=1
+revision=2
 _patch=_p1
-archs=noarch
 wrksrc="${pkgname}-${version}${_patch}"
 hostmakedepends="perl"
 short_desc="Broadcom Bluetooth firmware for Linux kernel"

From 8446ef275185e82a5909afeb04b8e3231887b50a Mon Sep 17 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 0179/3595] bsdbuild: remove noarch

---
 srcpkgs/bsdbuild/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template
index 11115999c94..8ece9e701b9 100644
--- a/srcpkgs/bsdbuild/template
+++ b/srcpkgs/bsdbuild/template
@@ -1,8 +1,7 @@
 # Template file for 'bsdbuild'
 pkgname=bsdbuild
 version=3.1
-revision=2
-archs=noarch
+revision=3
 build_style=gnu-configure
 configure_args="--with-manpages --with-manlinks"
 hostmakedepends="groff perl"

From a1e47f5b5982ee865ec74b42eb8f3731dadeeba4 Mon Sep 17 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 0180/3595] bucklespring: remove noarch

---
 srcpkgs/bucklespring/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bucklespring/template b/srcpkgs/bucklespring/template
index ac9bfd3b499..2e4568bb746 100644
--- a/srcpkgs/bucklespring/template
+++ b/srcpkgs/bucklespring/template
@@ -1,7 +1,7 @@
 # Template file for 'bucklespring'
 pkgname=bucklespring
 version=1.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PATH_AUDIO=/usr/share/${pkgname}/wav"
@@ -27,7 +27,6 @@ do_install() {
 
 bucklespring-data_package() {
 	short_desc+=" - data files"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share
 	}

From 37051ab866c003e8d3b123030a80967eebc6552d Mon Sep 17 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 0181/3595] buku: remove noarch

---
 srcpkgs/buku/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template
index 5a5be1e8d2c..9925789acb2 100644
--- a/srcpkgs/buku/template
+++ b/srcpkgs/buku/template
@@ -1,8 +1,7 @@
 # Template file for 'buku'
 pkgname=buku
 version=4.3
-revision=1
-archs=noarch
+revision=2
 depends="python3-urllib3 python3-BeautifulSoup4 python3-cryptography python3-html5lib"
 short_desc="Cmdline bookmark management utility"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 7ded0ddfffc2b418d030ca9a3e5332e4135afb08 Mon Sep 17 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 0182/3595] burp2-server: remove noarch

---
 srcpkgs/burp2-server/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 9845f6afe9e..edda1f11f7e 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,7 +3,7 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=3
+revision=4
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
@@ -79,7 +79,6 @@ burp2-client_package() {
 
 burp2-doc_package() {
 	short_desc="${_desc} - Doc and examples"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc/burp
 		vmove usr/share/examples

From 200a390d13006d54bacb4577e3258ca9731a72bc Mon Sep 17 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, 21 Nov 2020 17:20:13 +0700
Subject: [PATCH 0183/3595] bwidget: remove noarch, update checksum.

Everything is the same but permission (755 -> 644)
---
 srcpkgs/bwidget/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/bwidget/template b/srcpkgs/bwidget/template
index b6c57fccb25..c365e64d225 100644
--- a/srcpkgs/bwidget/template
+++ b/srcpkgs/bwidget/template
@@ -1,8 +1,7 @@
 # Template file for 'bwidget'
 pkgname=bwidget
 version=1.9.14
-revision=1
-archs=noarch
+revision=2
 makedepends="tk"
 depends="tk"
 short_desc="Set of extension widgets for Tcl/Tk"
@@ -10,14 +9,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="TCL"
 homepage="http://tcllib.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/${version}/${pkgname}-${version}.tar.gz"
-checksum=531a6ecfa33114471dd58b0bedd5f9ff6f311c792fc1a030d8e454c5ebb5d44e
+checksum=8e9692140167161877601445e7a5b9da5bb738ce8d08ee99b016629bc784a672
 
 do_install() {
 	local _tclversion=8.6
 
 	vmkdir usr/lib/tcl8.6/BWidget
-	bsdtar xzvf $XBPS_SRCDISTDIR/${pkgname}-${version}/$pkgname-$version.tar.gz -C $DESTDIR/usr/lib/tcl$_tclversion/
-	mv $DESTDIR/usr/lib/tcl$_tclversion/$pkgname-$version/* \
-		$DESTDIR/usr/lib/tcl$_tclversion/BWidget
-	rmdir $DESTDIR/usr/lib/tcl8.6/$pkgname-$version
+	vcopy "*" usr/lib/tcl8.6/BWidget
 }

From 886ff6551045f82f4bf549437307b94a67904d76 Mon Sep 17 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, 21 Nov 2020 17:20:14 +0700
Subject: [PATCH 0184/3595] byobu: remove noarch

---
 srcpkgs/byobu/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/byobu/template b/srcpkgs/byobu/template
index 29c355cb943..1436dfccbcc 100644
--- a/srcpkgs/byobu/template
+++ b/srcpkgs/byobu/template
@@ -1,8 +1,7 @@
 # Template file for 'byobu'
 pkgname=byobu
 version=5.133
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 depends="tmux"
 short_desc="Open source text-based window manager and terminal multiplexer"

From a3aa6e3840a26945828260c8f52acd387bf69a1e Mon Sep 17 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, 21 Nov 2020 17:20:14 +0700
Subject: [PATCH 0185/3595] bzrtools: remove noarch

---
 srcpkgs/bzrtools/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
index 0c31b0fa84e..05492b1b5e2 100644
--- a/srcpkgs/bzrtools/template
+++ b/srcpkgs/bzrtools/template
@@ -1,11 +1,9 @@
 # Template file for 'bzrtools'
 pkgname=bzrtools
 version=2.6.0
-revision=3
-archs=noarch
+revision=4
 wrksrc=bzrtools
 build_style=python2-module
-pycompile_module="bzrlib/plugins/bzrtools"
 hostmakedepends="python"
 makedepends="python bzr"
 depends="${makedepends}"

From d97c136fd7cf1afdc32df67816cdb533e4ddf37a Mon Sep 17 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, 21 Nov 2020 17:39:30 +0700
Subject: [PATCH 0186/3595] soundkonverter: fix ftbfs

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

diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index 7a26b9a48a8..e11cd964264 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -4,7 +4,9 @@ version=3.0.1
 revision=2
 build_wrksrc=src
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
+ qt5-host-tools pkg-config"
 makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
  qt5-devel taglib-devel ksolid-devel"
 depends="hicolor-icon-theme"
@@ -15,6 +17,4 @@ homepage="https://github.com/dfaust/soundkonverter"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools"
-fi
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"

From c524fc7c8ccf046c88672dccd2f9ebd94c7f7544 Mon Sep 17 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, 21 Nov 2020 19:37:13 +0700
Subject: [PATCH 0187/3595] splint: fix build with new bison

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

diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index d51bba366a5..4e3a93eaf29 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -15,6 +15,7 @@ checksum=51cd7ba978a366ae1ededac2b927058fd5f45d5455e5a9d640b75ab4e45b748a
 disable_parallel_build=yes
 nocross=yes
 
-post_extract() {
-	sed -i 's/__pid_t/pid_t/g' src/osd.c
+post_patch() {
+	vsed -i 's/__pid_t/pid_t/g' src/osd.c
+	vsed -i -e '/RM.*[.]tab[.]h/d' src/Makefile.am src/Makefile.in
 }

From 615fc4a48bfb06ec9cac5c031acececbbd4607f8 Mon Sep 17 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, 21 Nov 2020 19:46:24 +0700
Subject: [PATCH 0188/3595] telepathy-salut: fix ftbfs, expand license

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

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index 93bcbd233ed..e5cf92d2d0c 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,21 +1,20 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=18
+revision=19
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-tests --disable-plugins --with-tls=openssl
 --disable-avahi-tests --disable-static"
-hostmakedepends="pkg-config xmldiff glib-devel"
+hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
  libressl-devel libuuid-devel sqlite-devel"
 depends="avahi"
-short_desc="A link-local XMPP connection manager for Telepathy"
+short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://telepathy.freedesktop.org"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e
 
-# http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio
-nocross=yes
+nocross="http://build.voidlinux.org/builders/armv7l_builder/builds/16213/steps/shell_3/logs/stdio"

From c1ac51960352603c5e447c6f2712b2fbeae5ff78 Mon Sep 17 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, 21 Nov 2020 19:51:33 +0700
Subject: [PATCH 0189/3595] vala-panel: fix ftbfs

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

diff --git a/srcpkgs/vala-panel/template b/srcpkgs/vala-panel/template
index 9d681d5ae1a..86ac40b49a7 100644
--- a/srcpkgs/vala-panel/template
+++ b/srcpkgs/vala-panel/template
@@ -12,6 +12,8 @@ homepage="https://gitlab.com/vala-panel-project/vala-panel"
 distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/c42b5fbbfb42c5889e7184f5ead03f65/vala-panel-${version}.tar.xz"
 checksum=09635f557e3d52894267a66297552119e874a25f9366bf5a1eeda8cfba948462
 
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
+
 vala-panel-devel_package() {
 	short_desc+=" - development files"
 	depends="vala-panel-${version}_${revision}"

From 9dfa02a2784ad2c85369cac27e565186c3990cb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 13:41:36 +0100
Subject: [PATCH 0190/3595] awsume: update to 4.5.0.

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

diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template
index 3c216c098b5..b7c5edb6b59 100644
--- a/srcpkgs/awsume/template
+++ b/srcpkgs/awsume/template
@@ -1,18 +1,18 @@
 # Template file for 'awsume'
 pkgname=awsume
-version=4.4.1
-revision=3
+version=4.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 makedepends="python3-argcomplete python3-boto3 python3-colorama python3-coverage
  python3-pluggy python3-psutil python3-xmltodict python3-yaml"
-depends="$makedepends"
+depends="${makedepends}"
 short_desc="Utility for easily assuming AWS IAM roles from the command line"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://awsu.me/"
 distfiles="https://github.com/trek10inc/awsume/archive/${version}.tar.gz"
-checksum=66d698b4716a1dc7c927778a8fe124a6ac2d99334aff2be5dac6b13598b4e08f
+checksum=3b506e08727400f32886db522477e3ae73d5941266611abbd9a470f3bb17d80b
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/awsume.*

From c8d38f1b1f45e8b2b4095c9724aa800c70830cdb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 13:47:12 +0100
Subject: [PATCH 0191/3595] djview: update to 4.12.

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

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index e39d2a23576..136bcced9fb 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,18 +1,19 @@
 # Template file for 'djview'
 pkgname=djview
-version=4.10.6
-revision=2
+version=4.12
+revision=1
+wrksrc="djview4-${version}"
 build_style=gnu-configure
 build_helper=qmake
 configure_args="QMAKE=qmake-qt5"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
+hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
 makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
 short_desc="Portable DjVu viewer and browser plugin"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://djvu.sourceforge.net/djview4.html"
 distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz"
-checksum=8446f3cd692238421a342f12baa365528445637bffb96899f319fe762fda7c21
+checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
@@ -23,3 +24,7 @@ post_extract() {
 		-e '/StartupWMClass/s/Djview4/DjView/' \
 		 desktopfiles/djvulibre-djview4.desktop
 }
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}

From 418361e9bd15091639787f257690dc0fb58aa5fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 14:04:49 +0100
Subject: [PATCH 0192/3595] libX11: update to 1.7.0.

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

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 407b2199106..2c62d583432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.6.12
+version=1.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7
+checksum=36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake xorgproto xtrans"

From 6766ff01b8b072ce3a00cd1fc5da4427e9c54c19 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 14:04:53 +0100
Subject: [PATCH 0193/3595] python3-boto3: update to 1.16.23.

---
 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 8d32ad71612..4c8a67faabc 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.19
+version=1.16.23
 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=5593164dc333131059c338e525eefeabe1d5195479e963e3a6cfb45ccff13c45
+checksum=370f7c8aaf9c31f683a8aa5fa3c0a3e616e633f9e0d23778ed8a32564086cba7
 
 post_install() {
 	vlicense LICENSE

From d4d18592771864117566263e7d052372c575cbd4 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:25:40 +0200
Subject: [PATCH 0194/3595] R-cran-R6: update to 2.5.0.

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

diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 8c06f5a3cf7..3c35ffadb06 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,13 +1,13 @@
 # Template file for 'R-cran-R6'
 pkgname=R-cran-R6
-version=2.4.1
-revision=2
+version=2.5.0
+revision=1
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/r-lib/R6"
-checksum=26b0fd64827655c28c903f7ff623e839447387f3ad9b04939a02f41ac82faa3e
+checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02
 
 post_install() {
 	vlicense LICENSE

From c69718405ee0f88463ee474e288044f09d91b2bb Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:25:50 +0200
Subject: [PATCH 0195/3595] R-cran-ps: update to 1.4.0.

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

diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index 1f95a5d7f2c..d4497a4d234 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -1,13 +1,13 @@
 # Template file for 'R-cran-ps'
 pkgname=R-cran-ps
-version=1.3.4
+version=1.4.0
 revision=1
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
-license="BSD-3-Clause"
+license="MIT"
 homepage="https://github.com/r-lib/ps"
-checksum=8468c6994e199053050c614fb3e6ee0e670833a0185abf53d6cb09e19c85aeb3
+checksum=5f79ae4489090e07abbea892049ec0db900d31955237b388664289e6dc00da7a
 
 post_install() {
 	vlicense LICENSE

From 3fbdcc774947c2a7fa470f7f2341ea5ae905f792 Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Sat, 21 Nov 2020 02:26:01 +0200
Subject: [PATCH 0196/3595] R-cran-processx: update to 3.4.4.

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

diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index e051b4b3682..9560ded758b 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-processx'
 pkgname=R-cran-processx
-version=3.4.3
-revision=2
+version=3.4.4
+revision=1
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"
@@ -9,7 +9,7 @@ short_desc="Execute and Control System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/processx"
-checksum=f247f2180f72e59f1e6d7149ddb44796698eb6be97cc8c479d5f488b65fcb01d
+checksum=aaa40f10a6670eeb451e038bc0eb7c16f263dacb797f76d965b9fc75dda7482b
 
 post_install() {
 	vlicense LICENSE

From 25d0a6c59650c4aae7a5fa5284306373dac79f6a Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 21 Nov 2020 08:09:43 -0800
Subject: [PATCH 0197/3595] NetAuth-ldap: update to 0.2.0

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

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index 105d5c6ee0f..425ccf49079 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
-version=0.1.0
+version=0.2.0
 revision=1
 wrksrc=ldap-$version
 build_style=go
@@ -8,11 +8,11 @@ go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
 hostmakedepends="git"
 short_desc="LDAP Proxy for NetAuth"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://www.netauth.org/ecosystem/ldap"
 distfiles="https://github.com/netauth/ldap/archive/v$version.tar.gz"
-checksum=e179918429f133f8360bf9ee6a1ceefa283f245bf5ee0b705676fff9e1442fb4
+checksum=581b60475e940efff673edd3a0fb5ab34fef28f4872fc51a0720013f2004c2f0
 system_accounts="_netauth_ldap"
 
 post_install() {

From 68cafbe8de3b6ba2390795fa78ebd93aa5b841ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 21 Nov 2020 17:55:31 +0100
Subject: [PATCH 0198/3595] xtools: update to 0.62.

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

diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index d1b5e0fe4f2..f6b143d8aba 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,8 +1,7 @@
 # Template file for 'xtools'
 pkgname=xtools
-version=0.61
+version=0.62
 revision=1
-archs="noarch"
 build_style=gnu-makefile
 depends="bash curl findutils git make spdx-licenses-list xbps"
 short_desc="Opinionated helpers for working with XBPS"
@@ -10,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=03de4897b9f2189c4164a49e0d595580ad0a587054c2d1591003992741835409
+checksum=befbe27f4b8091f04ab79024b76c0bad15f86a5f5e6f3624648d633b854696df

From 32926b87067ecd9c2d107d2809da52113a93fae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 14:06:36 -0300
Subject: [PATCH 0199/3595] djview: mark broken temporarily.

There's an issue when fetching due to sourceforge's redirects, mark
broken for now.
---
 srcpkgs/djview/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index 136bcced9fb..c7b0cd84bcf 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -19,6 +19,13 @@ if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl|armv7l-musl|x86_64-musl)
+		# error while fetching with xbps-fetch
+		broken="djview-4.12.tar.gz: Temporary Redirect"
+		;;
+esac
+
 post_extract() {
 	vsed -i -e '/Exec/s/djview4/djview/' \
 		-e '/StartupWMClass/s/Djview4/DjView/' \

From 90680919187d6458ec4ab544a7c36505e7e4226e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 21 Nov 2020 19:14:24 +0400
Subject: [PATCH 0200/3595] osinfo-db: update to 20201119.

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

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 300f6bbc960..75462422bf4 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,15 +1,15 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20201015
+version=20201119
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
 short_desc="Osinfo database about operating systems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=0a07a9eceebfb058528cb7092f30d7b843595715e2e053acde03acbc62a640c4
+checksum=74f01379359248cb253f86d1126fffc89f319136e35d483c1fd4aa01b3200ca8
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From 2b89d220e46669966d1405ab33f17c5a629b08b3 Mon Sep 17 00:00:00 2001
From: aktsbot <box.ashishk@gmail.com>
Date: Sat, 21 Nov 2020 16:00:45 +0530
Subject: [PATCH 0201/3595] font-manjari: update to 1.920

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

diff --git a/srcpkgs/font-manjari/template b/srcpkgs/font-manjari/template
index ad89f8bebbb..3303e7b2e0d 100644
--- a/srcpkgs/font-manjari/template
+++ b/srcpkgs/font-manjari/template
@@ -1,7 +1,7 @@
 # Template file for 'font-manjari'
 pkgname=font-manjari
-version=1.910
-revision=2
+version=1.920
+revision=1
 create_wrksrc=yes
 depends="font-util"
 short_desc="Malayalam font with smooth curves"
@@ -10,7 +10,7 @@ license="OFL-1.1"
 homepage="https://smc.org.in/fonts/manjari"
 distfiles="https://releases.smc.org.in/fonts/manjari/Version${version}/manjari-Version${version}.tar.gz
  https://gitlab.com/smc/fonts/manjari/-/raw/Version${version}/LICENSE.txt"
-checksum="943c2dfc3afb9e32d3e4baa132d3b49825cbaf1a39ae9220b73df11255c5d13e
+checksum="77cfe8fbb18ed5325e228d96b4b69cfd21cc9434eab18656fb9bc48ce691b9c3
  3ff5ecb5ffbfe008bcc1e2861f2124aabd5571ad1ae9badc245a4e383727ccd2"
 font_dirs="/usr/share/fonts/TTF"
 

From 2506694c0130f59754d9a41cd2d3bc4b57ba2a7a Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Fri, 20 Nov 2020 22:16:48 -0500
Subject: [PATCH 0202/3595] chezmoi: update to 1.8.9.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 836a483d71a..395eedd19e7 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=1.8.8
+version=1.8.9
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz"
-checksum=1cdd0a4d77714c5003e7abdb46cb3c0c64eb3dfe198d45d36dc5764c2c5c0fcd
+checksum=6e9d341672bc375ad2e9594a689c0c8ae8ebad0c964d699dfbd408fc93058b93
 
 post_install() {
 	vlicense LICENSE

From b5ec75af3be4fcc4e3a684b320605e2f354102af Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Fri, 20 Nov 2020 10:42:19 -0300
Subject: [PATCH 0203/3595] tty-solitaire: update to 1.3.0.

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

diff --git a/srcpkgs/tty-solitaire/template b/srcpkgs/tty-solitaire/template
index 3203baa6585..00c4a9d6386 100644
--- a/srcpkgs/tty-solitaire/template
+++ b/srcpkgs/tty-solitaire/template
@@ -1,16 +1,16 @@
 # Template file for 'tty-solitaire'
 pkgname=tty-solitaire
-version=1.1.1
+version=1.3.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
 makedepends="ncurses-devel"
 short_desc="Play solitaire in your terminal"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="MIT"
 homepage="https://github.com/mpereira/tty-solitaire"
 distfiles="https://github.com/mpereira/tty-solitaire/archive/v${version}.tar.gz"
-checksum=146f9ed6ee9d79dfd936c213e3a413a967daba3978fb1021e05a1c52c7684e9c
+checksum=a270ee639e911a89add6a3c765b0548c9d762e0388c323807708d2509cfa64a0
 
 CFLAGS="-fcommon"
 

From 3893c38b1e232974ff2c5aa3a9dc3a6b9c2f6ba8 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 19 Nov 2020 09:44:25 +0100
Subject: [PATCH 0204/3595] catgirl: update to 1.3

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

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index f3d7c469d01..c4f242f1b5f 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.2
+version=1.3
 revision=1
 build_style=gnu-configure
 make_build_target="all"
@@ -11,4 +11,4 @@ maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
 distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=d1265d023cffa4d997907b86b42760f30f44419fa1d5273267e9b16f67b46fb6
+checksum=be00ea0bd3c8a9582c792d2767bc1a671e05dff839a246b533797742fcda8cec

From 7a0bf599bdb868be3c7ee15555fb449ab103727d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 18 Nov 2020 15:50:53 -0600
Subject: [PATCH 0205/3595] gitea: update to 1.12.6

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

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 7f7a4e687de..e96ecf7d08b 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.12.2
+version=1.12.6
 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=695dae81327bdfaa4adaa9d3dc9d2bdcb78d54ac73abac3a630750465858ff8b
+checksum=98486d15c58b52177e58af300e1ac6afa46f2f85f61b8d96eacbbf73ccf1191e
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 11a9814e8afbc9c9234e9f378cd543766242fc1e Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 20 Nov 2020 21:29:00 +0600
Subject: [PATCH 0206/3595] opera: update to 72.0.3815.378.

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

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index fbda63d3d76..124cab7777c 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=72.0.3815.320
+version=72.0.3815.378
 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=520cc476126af6b324f3f0a290003d323c22fec70feb19c357ccddd884d840ad
+checksum=c2fa6f20c1380f4b95452c260eb0266ff83de4f3f40d42c1556f3806a10b666d
 repository="nonfree"
 nostrip=yes
 

From 18daed5893170f0c98dda978ebf43c368246821d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 Nov 2020 16:02:51 -0500
Subject: [PATCH 0207/3595] influxdb: update to 1.8.3.

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

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index e77b36ed222..eb1a592c1d1 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,6 +1,6 @@
 # Template file for 'influxdb'
 pkgname=influxdb
-version=1.7.9
+version=1.8.3
 revision=1
 build_style=go
 go_import_path=github.com/influxdata/influxdb
@@ -10,27 +10,28 @@ go_package="${go_import_path}/cmd/influx
  ${go_import_path}/cmd/influx_inspect
  ${go_import_path}/cmd/influx_stress"
 go_ldflags="-X main.version=${version}"
-hostmakedepends="dep"
+hostmakedepends="asciidoc xmlto"
 short_desc="Scalable datastore for metrics, events, and real-time analytics"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://influxdata.com/time-series-platform/influxdb/"
 changelog="https://raw.githubusercontent.com/influxdata/influxdb/master/CHANGELOG.md"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=fad5107985395353a584978f6c0ad1fbd4f41ea71bdc9cf55a006cc9a88d2b61
+checksum=d8b89e324ed7343c1397124ac3cc68c405406faf74e7369e733611cada54656d
 
 system_accounts="_influxdb"
 _influxdb_homedir="/var/lib/influxdb"
 make_dirs="${_influxdb_homedir} 0755 _influxdb _influxdb"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 
-pre_build() {
-	cd $GOSRCPATH
-	dep ensure
+post_build() {
+	make -C man build
 }
 
 post_install() {
 	vlicense LICENSE
 	vsv ${pkgname}
 	vinstall etc/config.sample.toml 644 etc/${pkgname} ${pkgname}.conf
+
+	make -C man DESTDIR="${DESTDIR}/usr" install
 }

From f7ef8733f43d4006a1cc857356baac900ddce43c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 19:33:05 +0200
Subject: [PATCH 0208/3595] tomb: update to 2.8.

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

diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 8c67f338b2b..5c72ec7c7e0 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,6 +1,6 @@
 # Template file for 'tomb'
 pkgname=tomb
-version=2.7
+version=2.8
 revision=1
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.dyne.org/software/tomb/"
 distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
-checksum=960107427e42cf0ac10b876cdec0e9f898c10a32d078e3370b7d9b7404a06a74
+checksum=2c064bcb121001dcdd2113c7b728f697e5e5bf8e887a6a4eb633ba5bf1ffef2d
 
 pre_build() {
 	sed -i extras/gtk-tray/Makefile \

From cc56423d8ff12a6e9fbe7aadad9fa5a94ad50c67 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 19:27:13 +0200
Subject: [PATCH 0209/3595] yabasic: update to 2.87.1.

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

diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template
index c91db99da22..c06e991d774 100644
--- a/srcpkgs/yabasic/template
+++ b/srcpkgs/yabasic/template
@@ -1,7 +1,7 @@
 # Template file for 'yabasic'
 pkgname=yabasic
 reverts="2.769_1"
-version=2.87.0
+version=2.87.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT, GPL-3.0-or-later"
 homepage="https://2484.de/yabasic/"
 distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz"
-checksum=7206b188f7f6d0ac7f20963bc73806af6f78a2829560172a114144b40f8419f7
+checksum=432f912d80ca00ae00a93ede197d45fde4db1345a61dc42976d10f2b7f9e1dce
 
 do_install() {
 	vbin yabasic

From ce10db9af2d10d0f00868fa1aed0bc64aae3f242 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <reg@reginaldtiangha.com>
Date: Thu, 19 Nov 2020 17:22:03 -0700
Subject: [PATCH 0210/3595] sigil: update to 1.4.1.

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

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index b94cbfa6ff1..0fecc98fba7 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,7 +1,7 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.3.0
-revision=2
+version=1.4.1
+revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
 pycompile_dirs="usr/share/sigil/python3lib"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ac302328f0d0e0144e67bd4cbd7834650eb219f81a623f393271bf6f0686cc56
+checksum=8e4919bde7b0e530e12a6feb8956e92e662270187d924a0102e505e942acacb1
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in

From 4e5320b6d35f7e58da6716a55d98bef66c91e785 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 18 Nov 2020 13:15:01 +1100
Subject: [PATCH 0211/3595] android-studio: update to 4.1.1.

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

diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 8b255050240..37ab37daf6b 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,11 +1,11 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.0
+version=4.1.1
 revision=1
 # _studio_build and _studio_rev are for downloading the zip from dl.google.com
 # https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=201.6858069
-_studio_rev=19
+_studio_build=201.6953283
+_studio_rev=0
 archs="x86_64 i686"
 create_wrksrc=yes
 hostmakedepends="tar"
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="http://tools.android.com/"
 # changelog="https://developer.android.com/studio/releases/index.html"
 distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
-checksum=4b9521fc4a6313ad65ff3e14b0f3fb50427d464fe14227555565f46e0ffad202
+checksum=68032184959c54576f119b7c7c8ded175d848374f3954fa450530d78260dd68b
 repository=nonfree
 restricted=yes
 python_version=2

From 62d075a3e9d47a5778744c372ede669ed1349f8e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 11:56:54 +0200
Subject: [PATCH 0212/3595] sublime-merge-bin: update to 2039.

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

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index aecc6b436c0..a57b827e614 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2038
+version=2039
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -11,8 +11,8 @@ maintainer="Adelmo Junior <noblehelm@gmail.com>"
 license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=3bfa0ca8a322d76117f824587761c57596b2b38a1c98e6a94963ba12f5e07197
-_license_checksum=aaf2f4a457945145bfea1ff06498806bd91951f76ec3cefec169f904ff4cb158
+checksum=289218c5a06ad7516477456d7e372d01fc0fbeb5761d239835ef442a11200251
+_license_checksum=d2ee1cc3f8af74d1eacc960a81fdf1ebe58a9b801bf0b2e2a2302fdefb0ee370
 nopie=yes
 repository=nonfree
 restricted=yes

From f00b2a485d1cf22cb480a754c0fb2ee199cf76d1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:07:02 -0600
Subject: [PATCH 0213/3595] jdupes: update to 1.19.0

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

diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 859fc70fa8c..0cba17ea701 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.14.0
+version=1.19.0
 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=b83285d97f1df5602647749829fdcdbcf21ece273c669bdb8e62544238b1f54e
+checksum=98676d3455c89882c3f7f4934602f9e7aca2b054caf3f0deaf286552ce9b276b
 
 post_install() {
 	vlicense LICENSE

From a9763fa5b739ccfbc4714478dbf5f23c0984a272 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 10:04:40 -0600
Subject: [PATCH 0214/3595] poedit: update to 2.4.2

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

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index eb5084c41f6..4b0fe5d6cbc 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,24 +1,23 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=2.4.1
+version=2.4.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
 makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
+ gtkspell3-devel libharfbuzz libxml2 Lucene++-devel webkit2gtk
+ wxWidgets-gtk3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Cross-platform gettext catalogs (.po files) editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=70143e55c16a88b9b29f48e12b0b9e55714177b60ba367fc29d5fa6dc28429c3
+checksum=fed9932a9228b381aa363d8340eb5193d61ffc761f4f328d3cf3cce8f7fbcd4e
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
 
-makedepends+=" libharfbuzz libxml2 webkit2gtk"
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-common-devel"
 	configure_args+=" WXRC=/usr/bin/wxrc --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"

From 8ecf794760f53d5ea066c9214ea0bacb3026c5a1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 09:33:25 -0600
Subject: [PATCH 0215/3595] clipgrab: update to 3.9.2

[ci skip]
---
 srcpkgs/clipgrab/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 72938c814bb..7fbb10204ff 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,10 +1,9 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.8.15
+version=3.9.2
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
-hostmakedepends="qt5-qmake qt5-devel"
 makedepends="qt5-webengine-devel qt5-webchannel-devel
  qt5-location-devel qt5-devel qt5-quickcontrols2-devel
  qt5-declarative-devel"
@@ -14,12 +13,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=769812558342ebf4dee0f1deb2fe2ea801278e9821d87ad8d639cec52144d7aa
+checksum=c5bfcb0f6c3bff52ea68c2b978812bcbd43718fd2bcd2dcad1d6a4c970be6cb2
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel
+	hostmakedepends=" qt5-location-devel qt5-quickcontrols2-devel
 	 qt5-declarative-devel qt5-webchannel-devel qt5-webengine-devel
-	 qt5-host-tools"
+	 qt5-host-tools qt5-devel"
 fi
 
 case "$XBPS_TARGET_MACHINE" in

From b772b7e87a24972527279e32334f7ed9b21e1dfd Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 10:32:15 -0600
Subject: [PATCH 0216/3595] minetest: update to 5.3.0

Adopt
LuaJIT with aarch64* causes PIE breakage; disable use of
LuaJIT for aarc64* due to CMakeLists.txt setting
---
 srcpkgs/minetest/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template
index 7f559cdf86a..15a26e0d1ef 100644
--- a/srcpkgs/minetest/template
+++ b/srcpkgs/minetest/template
@@ -1,22 +1,30 @@
 # Template file for 'minetest'
 pkgname=minetest
-version=5.2.0
+version=5.3.0
 revision=1
 build_style=cmake
-configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DBUILD_SERVER=TRUE"
+configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1
+ -DBUILD_SERVER=TRUE"
 hostmakedepends="pkg-config tar"
-makedepends="LuaJIT-devel MesaLib-devel freetype-devel gmp-devel irrlicht-devel
+makedepends="MesaLib-devel freetype-devel gmp-devel irrlicht-devel
  libcurl-devel libjpeg-turbo-devel libopenal-devel libvorbis-devel lua52-devel
  sqlite-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="InfiniMiner/Minecraft inspired game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Nathan <ndowens@artixlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.minetest.net"
 distfiles="https://github.com/minetest/minetest/archive/${version}.tar.gz
  https://github.com/minetest/minetest_game/archive/${version}.tar.gz>minetest_game-${version}.tar.gz"
-checksum="4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d
- 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94"
+checksum="65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6
+ 06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d"
+
+# LuaJIT enabled causes PIE to
+# be broken/not-used on aarch64*
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) makedepends+=" LuaJIT-devel" ;;
+esac
 
 pre_install() {
 	# Install the minetest_game subgame.

From 1a0a16111a15cfa0d101e313db8a353cc9a5686d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 18 Nov 2020 11:53:05 +0100
Subject: [PATCH 0217/3595] davfs2: update to 1.6.0

---
 srcpkgs/davfs2/patches/100-musl-compat.patch |  7 ++++---
 srcpkgs/davfs2/patches/neon-0.31.patch       | 11 -----------
 srcpkgs/davfs2/template                      |  4 ++--
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/davfs2/patches/neon-0.31.patch

diff --git a/srcpkgs/davfs2/patches/100-musl-compat.patch b/srcpkgs/davfs2/patches/100-musl-compat.patch
index 646a883a9fb..6d56821f2ff 100644
--- a/srcpkgs/davfs2/patches/100-musl-compat.patch
+++ b/srcpkgs/davfs2/patches/100-musl-compat.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2020-04-02 12:05:25.019234433 +0200
-+++ configure.ac	2020-04-02 12:06:27.138863342 +0200
+--- configure.ac
++++ configure.ac
 @@ -42,7 +42,7 @@ DAV_CHECK_NEON
  # Checks for header files.
  AC_HEADER_DIRENT
@@ -53,7 +53,8 @@
  
  #include "config.h"
 +#include "compat.h"
- 
+
+ #include <errno.h>
 -#include <error.h>
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
diff --git a/srcpkgs/davfs2/patches/neon-0.31.patch b/srcpkgs/davfs2/patches/neon-0.31.patch
deleted file mode 100644
index 8a8d5691640..00000000000
--- a/srcpkgs/davfs2/patches/neon-0.31.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2020-04-02 12:00:27.586207223 +0200
-+++ configure.ac	2020-04-02 12:00:37.057303637 +0200
-@@ -36,7 +36,7 @@ AC_PROG_LN_S
- # Checks for libraries.
- AM_GNU_GETTEXT_VERSION(0.18.1)
- AM_GNU_GETTEXT([external])
--NE_REQUIRE_VERSIONS([0], [27 28 29 30])
-+NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
- DAV_CHECK_NEON
- 
- # Checks for header files.
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index d94b71a70e6..01eb6336fc4 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,6 +1,6 @@
 # Template file for 'davfs2'
 pkgname=davfs2
-version=1.5.6
+version=1.6.0
 revision=1
 build_style=gnu-configure
 configure_args="dav_user=nobody dav_group=network --enable-largefile"
@@ -12,7 +12,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-3.0-or-later"
 homepage="https://savannah.nongnu.org/projects/davfs2"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=417476cdcfd53966b2dcfaf12455b54f315959b488a89255ab4b44586153d801
+checksum=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
 
 CFLAGS="-fcommon"
 

From ca86a39e60440fdd089ab4480fd00832f8ea575e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:21:34 -0600
Subject: [PATCH 0218/3595] guake: update to 3.7.0

---
 srcpkgs/guake/template | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index ae5192edb0f..8f0fbe4d2be 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -1,10 +1,8 @@
 # Template file for 'guake'
 pkgname=guake
-version=3.6.3
-revision=4
+version=3.7.0
+revision=1
 build_style=python3-module
-wrksrc="Guake-${version}"
-pycompile_module="guake"
 hostmakedepends="gettext python3-setuptools"
 makedepends="python3-devel python3-pbr"
 depends="desktop-file-utils libkeybinder3 libnotify python3-dbus python3-gobject
@@ -14,14 +12,18 @@ short_desc="Drop-down terminal for GNOME"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://guake-project.org/"
-distfiles="${PYPI_SITE}/G/Guake/Guake-${version}.tar.gz"
-checksum=dabfb58070c721b3e2d8fc9621afdd9de74ed7929d2453a9d08058baab5b7791
+distfiles="${PYPI_SITE}/g/guake/guake-${version}.tar.gz"
+checksum=31fd7d6f62aa0a5e0121e240682e6a9e5ce61cdb266f9438987837f52d552e47
 
 pre_build() {
 	GUAKE_SCHEMA_DIR="/usr/share/glib-2.0/schemas"
 	make generate-desktop generate-mo prefix=/usr COMPILE_SCHEMA=0
-	make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0
-	sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' guake/paths.py 
+
+	make generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' \
+		DEV_SCHEMA_DIR='$(gsettingsschemadir)' COMPILE_SCHEMA=0
+
+	vsed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' \
+		guake/paths.py
 }
 
 do_check() {
@@ -30,5 +32,5 @@ do_check() {
 }
 
 pre_install() {
-	make prefix=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas
+	make PREFIX=/usr DESTDIR=${DESTDIR} COMPILE_SCHEMA=0 install-locale install-schemas
 }

From 91fea1ded6236d46ca5062a02ca8a1fb082cd6c2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 09:31:48 -0600
Subject: [PATCH 0219/3595] oil: update to 0.8.4

Use system python instead of internal
---
 srcpkgs/oil/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 0e13b5d103f..b68eca52034 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,19 +1,20 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.8.3
+version=0.8.4
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
-makedepends="$(vopt_if readline readline-devel)"
+hostmakedepends="$(vopt_if readline readline-devel) python"
+makedepends="$hostmakedepends"
 short_desc="Oil, a new unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3f78c606cde84ef0e90d1744d400c8428941eaab6515f382fabc28cf16453ccb
-python_version=2 #unverified
+checksum=08fd1c6d653ea594a5dcecb7bf40037e683845cf7627129bbeeb4d0b9fe7b879
+python_version=2
 register_shell="/usr/bin/osh"
-nocross="oil is nocross"
+nocross="Binaries doesn't build if cross built"
 nostrip=yes
 
 build_options="readline"
@@ -22,6 +23,8 @@ build_options_default="readline"
 pre_build() {
 	# Remove the strip wrapper
 	rm -f "${XBPS_WRAPPERDIR}"/strip
+	# Use system python
+	vsed -i 's|$PREPARE_DIR/python|python|g' build/actions.sh
 }
 
 do_install() {

From d3d2c9fd353c3fe2cc2698c8eb76928bb5d1c1e5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 16 Nov 2020 16:34:35 -0600
Subject: [PATCH 0220/3595] hydrogen: update to 1.0.1

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

diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 1b46559cdc6..2f4005fd125 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -1,6 +1,6 @@
 # Template file for 'hydrogen'
 pkgname=hydrogen
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=cmake
 # Our flags has -g already, DEBUG=ON will add -O0
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.hydrogen-music.org/"
 distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
-checksum=c4eac296a0d20578c274faf7816cf35c16ed43b634d91d2d19686bf9bbfeb970
+checksum=de6e8ba259ff340037f24e80f8b34592138603b080b02cfa3214ef9b0d66ac63
 
 post_patch() {
 	vsed -i '/INSTALL/s,"data,"/usr/share/hydrogen/data,' \

From 0923bd0c62b0f635d0b28456b68ffab0c2094852 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 21:27:42 -0600
Subject: [PATCH 0221/3595] oxipng: update to 4.0.0

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

diff --git a/srcpkgs/oxipng/template b/srcpkgs/oxipng/template
index 71b10a0a6de..9c583ba571e 100644
--- a/srcpkgs/oxipng/template
+++ b/srcpkgs/oxipng/template
@@ -1,6 +1,6 @@
 # Template file for 'oxipng'
 pkgname=oxipng
-version=3.0.1
+version=4.0.0
 revision=1
 build_style=cargo
 short_desc="Multithreaded lossless PNG compression optimizer"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/shssoichiro/oxipng"
 changelog="https://raw.githubusercontent.com/shssoichiro/oxipng/master/CHANGELOG.md"
 distfiles="https://github.com/shssoichiro/oxipng/archive/v${version}.tar.gz"
-checksum=31b036b146d087b989c22111637129ab8cb29a26719bfff1290427ff8b595e11
+checksum=10308fb78bc5b1b00b7450d812f652bfe6fb6d98d68a0c540bb5d3b9cfd56e68
 
 post_install() {
 	vlicense LICENSE

From 5b3f458b3cf2ad4e7bd7d190c13cbb3fd6b3f3fb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 15 Nov 2020 10:32:29 +0100
Subject: [PATCH 0222/3595] perl-File-Listing: update to 6.11

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

diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index 27ea1427ef8..1cf6d3f5275 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-File-Listing'
 pkgname=perl-File-Listing
-version=6.04
-revision=6
+version=6.11
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Listing"
 distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
-checksum=1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
+checksum=c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e

From 914e6a67047a557f02ad2611bfafd48c5767cc27 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 14 Nov 2020 20:46:45 -0800
Subject: [PATCH 0223/3595] pinebookpro-firmware: include clm_blob

Ship the clm_blob so that the correct frequencies are used for the
relevant wireless jurisdiction. Otherwise, only limited frequences are
supported.
---
 srcpkgs/pinebookpro-firmware/template | 28 +++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pinebookpro-firmware/template b/srcpkgs/pinebookpro-firmware/template
index 8fd4fbf5f30..4d29df0915b 100644
--- a/srcpkgs/pinebookpro-firmware/template
+++ b/srcpkgs/pinebookpro-firmware/template
@@ -1,20 +1,36 @@
 # Template file for 'pinebookpro-firmware'
 pkgname=pinebookpro-firmware
 reverts=20200215_1
-version=0.0.20200215
+version=0.0.20201114
 revision=1
-_commit=58820c428d2ecae6aaf5e4f00997652b9479853a
+_rockchip_commit=72c91aa297a10140781e3f83419c077d4bf8890c
+_manjaro_commit=7074a2e21dd804e229eab1c031bc00246e9173e0
 archs="aarch64*"
-wrksrc="rkwifibt-${_commit}"
+create_wrksrc=yes
 short_desc="Firmware files for the Pinebook Pro"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="Apache-2.0"
 homepage="https://github.com/rockchip-linux/rkwifibt"
-distfiles="https://github.com/rockchip-linux/rkwifibt/archive/${_commit}.tar.gz"
-checksum=20161cf3011f57dc9912db7270be1a83e543a61ea8757c23eaf983542fb021e0
+distfiles="
+ https://github.com/rockchip-linux/rkwifibt/archive/${_rockchip_commit}.tar.gz
+ https://gitlab.manjaro.org/manjaro-arm/packages/community/ap6256-firmware/-/archive/${_manjaro_commit}/ap6256-firmware-${_manjaro_commit}.tar.gz"
+checksum="
+ f73a89b09cccb283b92911e978188987859c97cb78957ab1dbc2f169a0a5ec05
+ 190653595f0dbf564bf726bc0de3d3f06aa9a6fcd7743a9b3fdd5b3b233b6c6b"
 
 do_install() {
+	cd "${wrksrc}"
+	cd "ap6256-firmware-${_manjaro_commit}"
+	vinstall brcmfmac43456-sdio.clm_blob 644 usr/lib/firmware/brcm
+	cd ..
+	cd "rkwifibt-${_rockchip_commit}"
 	vinstall firmware/broadcom/AP6256/bt/BCM4345C5.hcd 644 usr/lib/firmware/brcm
 	vinstall firmware/broadcom/AP6256/wifi/fw_bcm43456c5_ag.bin 644 usr/lib/firmware/brcm brcmfmac43456-sdio.bin
-	vinstall firmware/broadcom/AP6256/wifi/nvram_ap6256.txt 644 usr/lib/firmware/brcm brcmfmac43456-sdio.pine64,pinebook-pro.txt
+	cp -f firmware/broadcom/AP6256/wifi/nvram_ap6256.txt .
+	vsed -i 's/ccode=DE/ccode=all/' nvram_ap6256.txt
+	vinstall nvram_ap6256.txt 644 usr/lib/firmware/brcm brcmfmac43456-sdio.txt
+	cd ..
+	for dev in pine64,pinebook-pro radxa,rockpi4b radxa,rockpi4c rockpro64-v2.1 rk3399-orangepi; do
+		ln -sf brcmfmac43456-sdio.txt "${DESTDIR}/usr/lib/firmware/brcm/brcmfmac43456-sdio.${dev}.txt"
+	done
 }

From be36bdd01e38cb3340b325ad369b25d24a8833b9 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Fri, 20 Nov 2020 23:08:28 +0100
Subject: [PATCH 0224/3595] qtkeychain-qt5: update to 0.11.1, adopt

closes #26275
---
 srcpkgs/qtkeychain-qt5/INSTALL.msg               |  2 +-
 .../patches/use-kwallet-dbus-def.patch           | 15 +++++++++++++++
 srcpkgs/qtkeychain-qt5/template                  | 16 +++++++++++-----
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch

diff --git a/srcpkgs/qtkeychain-qt5/INSTALL.msg b/srcpkgs/qtkeychain-qt5/INSTALL.msg
index 87e12556a84..b358ca1a984 100644
--- a/srcpkgs/qtkeychain-qt5/INSTALL.msg
+++ b/srcpkgs/qtkeychain-qt5/INSTALL.msg
@@ -1,2 +1,2 @@
 To actually use qtkeychain-qt5 you need to either have kwallet or
-libgnome-keyring installed.
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000..d97fcc7890b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- CMakeLists.txt.ORIG	2020-09-08 15:13:16.000000000 +0200
++++ CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 9bac2f766d0..4e4c982850a 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,22 +1,27 @@
 # Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
-version=0.9.1
-revision=2
+version=0.11.1
+revision=1
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config kwallet"
 makedepends="libsecret-devel qt5-tools-devel"
 short_desc="Platform-independent Qt5 API for storing passwords securely"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="yopito <pierre.bourgin@free.fr>"
 license="BSD-2-Clause"
 homepage="https://github.com/frankosterfeld/qtkeychain"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e
+checksum=77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"
 fi
 
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -28,5 +33,6 @@ qtkeychain-qt5-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/*.so
+		vmove usr/lib/qt5/mkspecs
 	}
 }

From 49f4a039bf596b77d12b4402963063f156c3821c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 18:58:40 -0600
Subject: [PATCH 0225/3595] partclone: update to 0.3.17

---
 srcpkgs/partclone/patches/0001-musl.patch | 40 +++++++++++++++++++++++
 srcpkgs/partclone/patches/musl.patch      | 23 -------------
 srcpkgs/partclone/template                |  6 ++--
 3 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 srcpkgs/partclone/patches/0001-musl.patch
 delete mode 100644 srcpkgs/partclone/patches/musl.patch

diff --git a/srcpkgs/partclone/patches/0001-musl.patch b/srcpkgs/partclone/patches/0001-musl.patch
new file mode 100644
index 00000000000..6720add1959
--- /dev/null
+++ b/srcpkgs/partclone/patches/0001-musl.patch
@@ -0,0 +1,40 @@
+From 3ea1aa99242204e3c1841ac11d9f7064591d3bff Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 18:53:54 -0600
+Subject: [PATCH] musl
+
+---
+ src/btrfs/kernel-lib/rbtree.h | 4 ++++
+ src/main.c                    | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h
+index 6d68907..affab1d 100644
+--- src/btrfs/kernel-lib/rbtree.h
++++ src/btrfs/kernel-lib/rbtree.h
+@@ -38,6 +38,10 @@
+ extern "C" {
+ #endif
+ 
++#ifndef __always_inline
++#define __always_inline			inline__attribute__((always_inline))
++#endif
++
+ struct rb_node {
+ 	unsigned long  __rb_parent_color;
+ 	struct rb_node *rb_right;
+diff --git src/main.c src/main.c
+index babcf0c..8a543f3 100644
+--- src/main.c
++++ src/main.c
+@@ -22,7 +22,6 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <mcheck.h>
+ #include <stdint.h>
+ #include <stdarg.h>
+ #include <string.h>
+-- 
+2.29.2
+
diff --git a/srcpkgs/partclone/patches/musl.patch b/srcpkgs/partclone/patches/musl.patch
deleted file mode 100644
index 815bc7fe356..00000000000
--- a/srcpkgs/partclone/patches/musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/main.c.orig
-+++ src/main.c
-@@ -20,7 +20,6 @@
- #include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <mcheck.h>
- #include <stdint.h>
- #include <stdarg.h>
- #include <string.h>
---- src/btrfs/rbtree.h.orig
-+++ src/btrfs/rbtree.h
-@@ -38,6 +38,10 @@
- extern "C" {
- #endif
- 
-+#ifndef __always_inline
-+#define __always_inline         inline __attribute__((always_inline))
-+#endif
-+
- struct rb_node {
- 	unsigned long  __rb_parent_color;
- 	struct rb_node *rb_right;
diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 3c504c88a71..59c975d9354 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,7 +1,7 @@
 # Template file for 'partclone'
 pkgname=partclone
-version=0.3.14
-revision=2
+version=0.3.17
+revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.partclone.org/"
 distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=c298d2e7a6da97660325ca9296174e94e78dfc161df01bfdb1ea36c7001a6879
+checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0
 CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
 
 pre_configure() {

From 74867c34497410f16efa3f7b25df99897af69cf9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:58:18 +0200
Subject: [PATCH 0226/3595] pelican: update to 4.5.1.

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

diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 1c47e8d711a..baa4f603c4f 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,9 +1,8 @@
 # Template file for 'pelican'
 pkgname=pelican
-version=4.2.0
-revision=3
+version=4.5.1
+revision=1
 build_style=python3-module
-pycompile_module="pelican"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-feedgenerator python3-Jinja2 python3-Pygments
  python3-docutils python3-pytz python3-blinker python3-Unidecode python3-six
@@ -20,7 +19,7 @@ changelog="https://raw.githubusercontent.com/getpelican/pelican/${version}/docs/
 # We can live with it.
 # distfiles="${PYPI_SITE}/p/pelican/pelican-${version}.tar.gz"
 distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
-checksum=4b0d4c9439217b49ace89f4f8b52c90e13fa283a786d7b12e2020a11f32f9a33
+checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
 
 post_extract() {
 	# This test is problematic,

From 8b7d34ab657bf8b243507f370723cc51995a0cef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:47:57 +0200
Subject: [PATCH 0227/3595] dragon-player: update to 20.08.3.

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

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 39bb3dc5945..165fc060bb0 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=20.08.1
+version=20.08.3
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040
+checksum=36a755be402d7b811483a17887ebf0c73fc92f92ecbe00b54c11158ee0591a93

From 2062f6dce7518ca6fb73177cf0c5f49de500b46a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:21:56 +0200
Subject: [PATCH 0228/3595] juk: update to 20.08.3.

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

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 1614b90ccca..e9486b1edcf 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8
+checksum=2ecee3680b92c753e0ccf95e50990fbb12021d81f62a329965a5d4fc480672cb

From 5f1a3825ee39beb7dd9287f0b4c13f11a69d4ee0 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 09:55:58 -0800
Subject: [PATCH 0229/3595] pinebookpro-base: update to 0.3

Mark asound.state file as mutable.

Rename udev hwdb to denote pinebookpro specificity.

Rather than using an evdev hwdb match, set up a custom match via a udev
rule so that only the keyboard (and not other devices are matched).

Without the custom rule, lines like the following appear in dmesg:

udevd[...]: Error calling EVIOCSKEYCODE on device node [...]: Invalid argument
---
 .../files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb}         | 2 +-
 srcpkgs/pinebookpro-base/files/60-pinebookpro.rules        | 7 +++++++
 srcpkgs/pinebookpro-base/template                          | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 rename srcpkgs/pinebookpro-base/files/{10-usb-kbd.hwdb => 10-pinebookpro.hwdb} (76%)
 create mode 100644 srcpkgs/pinebookpro-base/files/60-pinebookpro.rules

diff --git a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
similarity index 76%
rename from srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb
rename to srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
index f8348e6fb3e..65f4b3ed317 100644
--- a/srcpkgs/pinebookpro-base/files/10-usb-kbd.hwdb
+++ b/srcpkgs/pinebookpro-base/files/10-pinebookpro.hwdb
@@ -1,4 +1,4 @@
-evdev:input:b0003v258Ap001E*
+pinebookpro:keyboard
   KEYBOARD_KEY_700a5=brightnessdown
   KEYBOARD_KEY_700a6=brightnessup
   KEYBOARD_KEY_70066=sleep
diff --git a/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
new file mode 100644
index 00000000000..63d3e9ea21f
--- /dev/null
+++ b/srcpkgs/pinebookpro-base/files/60-pinebookpro.rules
@@ -0,0 +1,7 @@
+ACTION=="remove", GOTO="pinebookpro_end"
+KERNEL!="event*", GOTO="pinebookpro_end"
+
+ENV{idVendor}=="258a", ENV{idProduct}=="001e", ENV{ID_INPUT_KEYBOARD}=="1", \
+  IMPORT{builtin}="hwdb 'pinebookpro:keyboard'", RUN{builtin}+="keyboard"
+
+LABEL="pinebookpro_end"
diff --git a/srcpkgs/pinebookpro-base/template b/srcpkgs/pinebookpro-base/template
index 9b4a41eb9a6..fce0a329b98 100644
--- a/srcpkgs/pinebookpro-base/template
+++ b/srcpkgs/pinebookpro-base/template
@@ -1,6 +1,6 @@
 # Template file for 'pinebookpro-base'
 pkgname=pinebookpro-base
-version=0.2
+version=0.3
 revision=1
 archs="aarch64*"
 build_style=meta
@@ -9,8 +9,10 @@ short_desc="Void Linux Pinebook Pro platform package"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="Public Domain"
 homepage="https://www.voidlinux.org"
+mutable_files="/var/lib/alsa/asound.state"
 
 do_install() {
-	vinstall "${FILESDIR}/10-usb-kbd.hwdb" 644 usr/lib/udev/hwdb.d
+	vinstall "${FILESDIR}/60-pinebookpro.rules" 644 usr/lib/udev/rules.d
+	vinstall "${FILESDIR}/10-pinebookpro.hwdb" 644 usr/lib/udev/hwdb.d
 	vinstall "${FILESDIR}/asound.state" 644 var/lib/alsa
 }

From 5825bfbf51d0e801ddc0ea3d84deeee8a4643e6d Mon Sep 17 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, 21 Nov 2020 22:46:21 +0700
Subject: [PATCH 0230/3595] cvs2svn: remove package

- Abandon upstream, the homepage is timed-out from my local machine
- Python 2 only
- People could import via git: cvs -> git -> svn
- Other distro dropped this package, too.
---
 srcpkgs/cvs2svn/template | 21 ---------------------
 srcpkgs/cvs2svn/update   |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 srcpkgs/cvs2svn/template
 delete mode 100644 srcpkgs/cvs2svn/update

diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template
deleted file mode 100644
index 55e679f2abe..00000000000
--- a/srcpkgs/cvs2svn/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'cvs2svn'
-pkgname=cvs2svn
-version=2.5.0
-revision=1
-archs=noarch
-build_style=gnu-makefile
-make_build_args="man"
-hostmakedepends="python"
-depends="cvs python"
-short_desc="CVS to Subversion, git and bazaar repository conversion tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="http://cvs2svn.tigris.org/"
-distfiles="http://cvs2svn.tigris.org/files/documents/1462/49543/cvs2svn-${version}.tar.gz"
-checksum=6409d118730722f439760d41c08a5bfd05e5d3ff4a666050741e4a5dc2076aea
-
-post_install() {
-	vmkdir usr/share/man/man1
-	install -m644 *.1 ${DESTDIR}/usr/share/man/man1
-	vlicense COPYING
-}
diff --git a/srcpkgs/cvs2svn/update b/srcpkgs/cvs2svn/update
deleted file mode 100644
index d8edb80d8d9..00000000000
--- a/srcpkgs/cvs2svn/update
+++ /dev/null
@@ -1 +0,0 @@
-site="http://cvs2svn.tigris.org/servlets/ProjectDocumentList?folderID=2976"

From 74f8a90de887ebb6df05e2753c01db8467a86718 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 21 Nov 2020 09:33:37 -0800
Subject: [PATCH 0231/3595] jetbrains-jdk-bin: update to 11.0.9b1183.9.

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

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 68cba46aaf6..c895bfa4fe0 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.8b1031.1
+version=11.0.9b1183.9
 revision=1
 archs="x86_64"
 wrksrc="jbrsdk"
@@ -12,7 +12,7 @@ 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=0f72e1005648b020cec95957d1b6534158e06e6202e78263aed0976287d2488d
+checksum=aec4dbcf20f47bfe6e1f26dd84e17e395a8e31fda45c981ec8c2ba7767108494
 fetch_cmd="wget"
 # 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. ¯\_(ツ)_/¯

From a8a5a604d26e1f584afb199199a697a9c7f0197a Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 13 Nov 2020 19:28:22 -0700
Subject: [PATCH 0232/3595] New package: wbg-1.0.0

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

diff --git a/srcpkgs/wbg/template b/srcpkgs/wbg/template
new file mode 100644
index 00000000000..28fd6b2d9dc
--- /dev/null
+++ b/srcpkgs/wbg/template
@@ -0,0 +1,15 @@
+# Template file for 'wbg'
+pkgname=wbg
+version=1.0.1
+revision=1
+wrksrc=$pkgname
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="libjpeg-turbo-devel libpng-devel pixman-devel
+ tllist wayland-devel wayland-protocols"
+short_desc="Simple wallpaper application for Wayland compositors"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://codeberg.org/dnkl/wbg"
+distfiles="https://codeberg.org/dnkl/wbg/archive/${version}.tar.gz"
+checksum=20411bb0aead3775616ceaccd48c2a3028400e33094571acf7b6c0005154ac9d

From d405f0b8ec22ea4c9ebd1fdbcdbb753df86c0150 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 21:58:24 +0900
Subject: [PATCH 0233/3595] New package: terraform-ls-0.10.0

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/terraform-ls/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/terraform-ls/template

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
new file mode 100644
index 00000000000..d2e000bf24a
--- /dev/null
+++ b/srcpkgs/terraform-ls/template
@@ -0,0 +1,16 @@
+# Template file for 'terraform-ls'
+pkgname=terraform-ls
+version=0.10.0
+revision=1
+build_style=go
+go_import_path="github.com/hashicorp/$pkgname"
+short_desc="Terraform Language Server"
+maintainer="Sora Morimoto <sora@morimoto.io>"
+license="MPL-2.0"
+homepage="https://github.com/hashicorp/terraform-ls"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=4f6975960dab0d47297fb1cab5685482a12a1f04e148056bdba548d014dd5cd7
+
+post_install() {
+	vlicense LICENSE
+}

From 51999aad18b15f1966914514a857bb3630b6ad4d Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Fri, 13 Nov 2020 13:01:05 +0900
Subject: [PATCH 0234/3595] New package: tflint-0.20.3

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/tflint/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/tflint/template

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
new file mode 100644
index 00000000000..305bbc146b9
--- /dev/null
+++ b/srcpkgs/tflint/template
@@ -0,0 +1,16 @@
+# Template file for 'tflint'
+pkgname=tflint
+version=0.20.3
+revision=1
+build_style=go
+go_import_path="github.com/terraform-linters/$pkgname"
+short_desc="Terraform linter focused on possible errors, best practices, etc"
+maintainer="Sora Morimoto <sora@morimoto.io>"
+license="MPL-2.0"
+homepage="https://github.com/terraform-linters/tflint"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=a375bdcae4276e39607a026da9b50ddca6656586baed2c7c667ed77acf570985
+
+post_install() {
+	vlicense LICENSE
+}

From 308418373c4223d1fceb034a295fc0ac47740995 Mon Sep 17 00:00:00 2001
From: Kartik Singh <kartik.ynwa@gmail.com>
Date: Thu, 12 Nov 2020 18:00:00 +0530
Subject: [PATCH 0235/3595] New package: loudgain-0.6.8

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

diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
new file mode 100644
index 00000000000..f2916788343
--- /dev/null
+++ b/srcpkgs/loudgain/template
@@ -0,0 +1,17 @@
+# Template file for 'loudgain'
+pkgname=loudgain
+version=0.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libebur128-devel taglib-devel ffmpeg-devel"
+short_desc="ReplayGain 2.0 loudness normalizer"
+maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/Moonbase59/loudgain"
+distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
+checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
+
+post_install() {
+	vlicense COPYING
+}

From 92d1cf45637aae1eda9c8a100d3f723e76f204cb Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 9 Nov 2020 12:57:30 -0600
Subject: [PATCH 0236/3595] iptraf-ng: update to 1.2.1

---
 srcpkgs/iptraf-ng/patches/musl.patch | 230 ---------------------------
 srcpkgs/iptraf-ng/template           |   9 +-
 2 files changed, 5 insertions(+), 234 deletions(-)
 delete mode 100644 srcpkgs/iptraf-ng/patches/musl.patch

diff --git a/srcpkgs/iptraf-ng/patches/musl.patch b/srcpkgs/iptraf-ng/patches/musl.patch
deleted file mode 100644
index 9dbc36fac96..00000000000
--- a/srcpkgs/iptraf-ng/patches/musl.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From bc0001050b7c2dd92c5b0e78840efbaac5b8c1bb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 19 Dec 2019 03:18:52 +0100
-Subject: [PATCH] Use POSIX instead of Linux/GNU style fields
-
-This allows compilation on current musl, without breaking it on
-glibc. The fields are all in a union and refer to the same thing.
----
- src/ipfrag.c   |  8 ++++----
- src/itrafmon.c |  6 +++---
- src/othptab.c  | 12 ++++++------
- src/packet.c   | 16 ++++++++--------
- src/tcptable.c | 20 ++++++++++----------
- 5 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git src/ipfrag.c src/ipfrag.c
-index 76196e6..f9c28ad 100644
---- src/ipfrag.c
-+++ src/ipfrag.c
-@@ -190,11 +190,11 @@ unsigned int processfragment(struct iphdr *packet, in_port_t *sport,
- 		ftmp->firstin = 1;
- 		tpacket = ((char *) (packet)) + (packet->ihl * 4);
- 		if (packet->protocol == IPPROTO_TCP) {
--			ftmp->s_port = ntohs(((struct tcphdr *) tpacket)->source);
--			ftmp->d_port = ntohs(((struct tcphdr *) tpacket)->dest);
-+			ftmp->s_port = ntohs(((struct tcphdr *) tpacket)->th_sport);
-+			ftmp->d_port = ntohs(((struct tcphdr *) tpacket)->th_dport);
- 		} else if (packet->protocol == IPPROTO_UDP) {
--			ftmp->s_port = ntohs(((struct udphdr *) tpacket)->source);
--			ftmp->d_port = ntohs(((struct udphdr *) tpacket)->dest);
-+			ftmp->s_port = ntohs(((struct udphdr *) tpacket)->uh_sport);
-+			ftmp->d_port = ntohs(((struct udphdr *) tpacket)->uh_dport);
- 		}
- 	}
- 	while (dtmp != NULL) {
-diff --git src/itrafmon.c src/itrafmon.c
-index 670ab6d..fe4c5a8 100644
---- src/itrafmon.c
-+++ src/itrafmon.c
-@@ -1017,7 +1017,7 @@ void ipmon(time_t facilitytime, char *ifptr)
- 
- 			if (((ntohs(frag_off) & 0x3fff) == 0)	/* first frag only */
- 			    && (tcpentry == NULL)
--			    && (!(transpacket->fin))) {
-+			    && (!(transpacket->th_flags & TH_FIN))) {
- 
- 				/*
- 				 * Ok, so we have a packet.  Add it if this connection
-@@ -1078,7 +1078,7 @@ void ipmon(time_t facilitytime, char *ifptr)
- 				    && (tcpentry->pcount == 1)
- 				    && (!(tcpentry->stat & FLAG_RST))) {
- 					strcpy(msgstring, "first packet");
--					if (transpacket->syn)
-+					if (transpacket->th_flags & TH_SYN)
- 						strcat(msgstring, " (SYN)");
- 
- 					writetcplog(logging, logfile, tcpentry,
-@@ -1108,7 +1108,7 @@ void ipmon(time_t facilitytime, char *ifptr)
- 
- 				if (((tcpentry->oth_connection->finsent == 2)
- 				     &&	/* FINed and ACKed */
--				     (ntohl(transpacket->seq) == tcpentry->oth_connection->finack))
-+				     (ntohl(transpacket->th_seq) == tcpentry->oth_connection->finack))
- 				    || ((revlook)
- 					&& (((p_sstat != RESOLVED)
- 					     && (tcpentry->s_fstat == RESOLVED))
-diff --git src/othptab.c src/othptab.c
-index 142c9c2..479a55a 100644
---- src/othptab.c
-+++ src/othptab.c
-@@ -140,9 +140,9 @@ void process_dest_unreach(struct tcptable *table, char *packet, char *ifname)
- 		tcp = (struct tcphdr *) (packet + 48);
- 		struct sockaddr_storage saddr, daddr;
- 		sockaddr_make_ipv6(&saddr, &ip6->ip6_src);
--		sockaddr_set_port(&saddr, ntohs(tcp->source));
-+		sockaddr_set_port(&saddr, ntohs(tcp->th_sport));
- 		sockaddr_make_ipv6(&daddr, &ip6->ip6_dst);
--		sockaddr_set_port(&daddr, ntohs(tcp->dest));
-+		sockaddr_set_port(&daddr, ntohs(tcp->th_dport));
- 		tcpentry =
- 		    in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
- 	} else {
-@@ -151,9 +151,9 @@ void process_dest_unreach(struct tcptable *table, char *packet, char *ifname)
- 		tcp = (struct tcphdr *) (packet + 8 + (ip->ihl * 4));
- 		struct sockaddr_storage saddr, daddr;
- 		sockaddr_make_ipv4(&saddr, ip->saddr);
--		sockaddr_set_port(&saddr, ntohs(tcp->source));
-+		sockaddr_set_port(&saddr, ntohs(tcp->th_sport));
- 		sockaddr_make_ipv4(&daddr, ip->daddr);
--		sockaddr_set_port(&daddr, ntohs(tcp->dest));
-+		sockaddr_set_port(&daddr, ntohs(tcp->th_dport));
- 		tcpentry =
- 		    in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
- 	}
-@@ -212,10 +212,10 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
- 				new_entry->un.icmp6.code =
- 				    ((struct icmp6_hdr *) packet2)->icmp6_code;
- 			} else if (protocol == IPPROTO_UDP) {
--				servlook(ntohs(((struct udphdr *) packet2)->source),
-+				servlook(ntohs(((struct udphdr *) packet2)->uh_sport),
- 					 IPPROTO_UDP, new_entry->un.udp.s_sname,
- 					 10);
--				servlook(ntohs(((struct udphdr *) packet2)->dest),
-+				servlook(ntohs(((struct udphdr *) packet2)->uh_dport),
- 					 IPPROTO_UDP, new_entry->un.udp.d_sname,
- 					 10);
- 			} else if (protocol == IPPROTO_OSPFIGP) {
-diff --git src/packet.c src/packet.c
-index bc8ed21..b0d552b 100644
---- src/packet.c
-+++ src/packet.c
-@@ -247,13 +247,13 @@ again:
- 				switch (ip->protocol) {
- 				case IPPROTO_TCP:
- 					tcp = (struct tcphdr *) ip_payload;
--					sport_tmp = ntohs(tcp->source);
--					dport_tmp = ntohs(tcp->dest);
-+					sport_tmp = ntohs(tcp->th_sport);
-+					dport_tmp = ntohs(tcp->th_dport);
- 					break;
- 				case IPPROTO_UDP:
- 					udp = (struct udphdr *) ip_payload;
--					sport_tmp = ntohs(udp->source);
--					dport_tmp = ntohs(udp->dest);
-+					sport_tmp = ntohs(udp->uh_sport);
-+					dport_tmp = ntohs(udp->uh_dport);
- 					break;
- 				default:
- 					sport_tmp = 0;
-@@ -299,16 +299,16 @@ again:
- 		case IPPROTO_TCP:
- 			tcp = (struct tcphdr *) ip_payload;
- 			if (sport)
--				*sport = ntohs(tcp->source);
-+				*sport = ntohs(tcp->th_sport);
- 			if (dport)
--				*dport = ntohs(tcp->dest);
-+				*dport = ntohs(tcp->th_dport);
- 			break;
- 		case IPPROTO_UDP:
- 			udp = (struct udphdr *) ip_payload;
- 			if (sport)
--				*sport = ntohs(udp->source);
-+				*sport = ntohs(udp->uh_sport);
- 			if (dport)
--				*dport = ntohs(udp->dest);
-+				*dport = ntohs(udp->uh_dport);
- 			break;
- 		default:
- 			if (sport)
-diff --git src/tcptable.c src/tcptable.c
-index 956866c..3ef8508 100644
---- src/tcptable.c
-+++ src/tcptable.c
-@@ -613,19 +613,19 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 	 */
- 
- 	if (tableentry->pcount == 1) {
--		if ((transpacket->syn) || (transpacket->rst))
-+		if ((transpacket->th_flags & TH_SYN) || (transpacket->th_flags & TH_RST))
- 			tableentry->partial = 0;
- 		else
- 			tableentry->partial = 1;
- 	}
--	tableentry->win = ntohs(transpacket->window);
-+	tableentry->win = ntohs(transpacket->th_win);
- 
- 	tableentry->stat = 0;
- 
--	if (transpacket->syn)
-+	if (transpacket->th_flags & TH_SYN)
- 		tableentry->stat |= FLAG_SYN;
- 
--	if (transpacket->ack) {
-+	if (transpacket->th_flags & TH_ACK) {
- 		tableentry->stat |= FLAG_ACK;
- 
- 		/*
-@@ -639,7 +639,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 		 */
- 
- 		if ((tableentry->oth_connection->finsent == 1)
--		    && (ntohl(transpacket->seq) ==
-+		    && (ntohl(transpacket->th_seq) ==
- 			tableentry->oth_connection->finack)) {
- 			tableentry->oth_connection->finsent = 2;
- 
-@@ -660,7 +660,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 	 * in ACK above.
- 	 */
- 
--	if (transpacket->fin) {
-+	if (transpacket->th_flags & TH_FIN) {
- 
- 		/*
- 		 * First, we check if the opposite direction has no counts, in which
-@@ -688,7 +688,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 			 */
- 
- 			tableentry->finsent = 1;
--			tableentry->finack = ntohl(transpacket->ack_seq);
-+			tableentry->finack = ntohl(transpacket->th_ack);
- 		}
- 		if (logging) {
- 			char flowrate[64];
-@@ -701,7 +701,7 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 				    tableentry->psize, msgstring);
- 		}
- 	}
--	if (transpacket->rst) {
-+	if (transpacket->th_flags & TH_RST) {
- 		tableentry->stat |= FLAG_RST;
- 		if (!(tableentry->inclosed))
- 			addtoclosedlist(table, tableentry);
-@@ -720,10 +720,10 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 				    tableentry->psize, msgstring);
- 		}
- 	}
--	if (transpacket->psh)
-+	if (transpacket->th_flags & TH_PUSH)
- 		tableentry->stat |= FLAG_PSH;
- 
--	if (transpacket->urg)
-+	if (transpacket->th_flags & TH_URG)
- 		tableentry->stat |= FLAG_URG;
- 
- 	tableentry->lastupdate = tableentry->oth_connection->lastupdate =
--- 
-2.24.0
-
diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template
index 4fcb86ec182..89a17ed1723 100644
--- a/srcpkgs/iptraf-ng/template
+++ b/srcpkgs/iptraf-ng/template
@@ -1,14 +1,15 @@
 # Template file for 'iptraf-ng'
 pkgname=iptraf-ng
-version=1.1.4
-revision=3
-build_style=gnu-configure
+version=1.2.1
+revision=1
+build_style=gnu-makefile
+make_install_args="prefix=${DESTDIR}/usr sbindir=${DESTDIR}/usr/bin"
 makedepends="ncurses-devel"
 short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/iptraf-ng"
 distfiles="http://http.debian.net/debian/pool/main/i/iptraf-ng/iptraf-ng_${version}.orig.tar.gz"
-checksum=79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09
+checksum=9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870
 
 LDFLAGS="-lncursesw -lpanelw -lmenuw"

From f7431a1f44c3b94e4a765b7e0864dcaacd8bf81d Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:32:27 +0000
Subject: [PATCH 0237/3595] global: update to 6.6.5

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

diff --git a/srcpkgs/global/template b/srcpkgs/global/template
index 983db1bec97..dcaaa11b15d 100644
--- a/srcpkgs/global/template
+++ b/srcpkgs/global/template
@@ -1,6 +1,6 @@
 # Template file for 'global'
 pkgname=global
-version=6.6.4
+version=6.6.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-exuberant-ctags=/usr/bin/ctags
@@ -12,7 +12,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/global/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594
-python_version=2 #unverified
+checksum=9c3730bd9e975d94231f3402d5526b79c0b23cc665d624c9829c948dfad37b83
+python_version=3
 
 CFLAGS="-fcommon"

From b3f05b27b4faac1f9772c84f946fd6eb55adb1d1 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:20:14 +0000
Subject: [PATCH 0238/3595] delve: update to 1.5.0

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

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index 7de8cad55bb..00360982335 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,6 +1,6 @@
 # Template file for 'delve'
 pkgname=delve
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=go
 go_import_path=github.com/go-delve/delve/cmd/dlv
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/go-delve/delve"
 distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=6d9da41a18905c9819e33f475bf911facba1297674d2312ab5d7e2488fac685a
+checksum=f8bbaecdfc9d1ff6148900d3dea44b6dd06a7f0197be4e9a75c289b7f62682ab
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|arm*|ppc*) broken=yes ;;

From 18c9ba5694aa2d88f824d3416222baf30d7cf324 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sun, 8 Nov 2020 07:08:25 +0000
Subject: [PATCH 0239/3595] loksh: update to 6.8.1

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

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index a3dd27e5a3a..9089c868036 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=6.7.5
+version=6.8.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="custom:Public Domain"
 homepage="https://github.com/dimkr/loksh"
 distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=1a36bafc2bfb9dee11ca65f955528960283ed12f9b00c57c523c49b2a1c91dd5
+checksum=ceeda4913febdb7e5f42db6a465835178221417e9f24865b0017e89a1a6a610e
 register_shell="/bin/loksh"
 
 alternatives="

From 9563692ec92db610e9eb17739155e84721ee829f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 20:03:49 +0200
Subject: [PATCH 0240/3595] kdegraphics-thumbnailers: update to 20.08.3.

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

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 93ac206401b..9b11c64eb10 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995
+checksum=aed7570a2af795d1f14b54782c578572e639bb850aee88d69dd5b17e0f9f7f55

From 603ea10eebb4f7481dd95f4483c3d974468a6a9c Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Wed, 11 Nov 2020 21:44:13 -0500
Subject: [PATCH 0241/3595] New package: watchexec-1.14.1

(Based off of bat's template)
---
 srcpkgs/watchexec/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/watchexec/template

diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
new file mode 100644
index 00000000000..8b62e5ee01d
--- /dev/null
+++ b/srcpkgs/watchexec/template
@@ -0,0 +1,17 @@
+# Template file for 'watchexec'
+pkgname=watchexec
+version=1.14.1
+revision=1
+build_style=cargo
+short_desc="Executes commands in response to file modifications"
+maintainer="cptpcrd <cptpcrd.git@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/watchexec/watchexec"
+distfiles="https://github.com/watchexec/watchexec/archive/${version}.tar.gz"
+checksum=23ca90f1f070b0d30e821667c8b9deaf174d020373ea032e9e22f1a78adcfa1c
+
+post_install() {
+	vdoc README.md
+	vman doc/watchexec.1
+	vcompletion completions/zsh zsh
+}

From 5b6b16a584405f9a6ffc26184cb68fa0187308ce Mon Sep 17 00:00:00 2001
From: rc-05 <rc23@email.it>
Date: Sat, 20 Jun 2020 01:33:34 +0200
Subject: [PATCH 0242/3595] adobe-flash-plugin: update to 32.0.0.453.

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

diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 4460be81e58..3c2d29c7db5 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
-version=32.0.0.433
+version=32.0.0.453
 revision=1
 depends="curl hicolor-icon-theme desktop-file-utils"
 short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
@@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	 ${_url}/flash_player_npapi_linux.x86_64.tar.gz
 	 ${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
 	checksum="
-	 ee022c4b1a96eecbfc0e022396cdcb713dddc2fb82abe00dc9c6ddf9518a004d
-	 ccb865f3a2d39012ec36d13df236e67a0043c43368f4b4b60465d5664870f570"
+	 587fe7027ef410e6833a9428b61ea28d4047bce6e8ed4bff3127cb9e08723e37
+	 cab3d2b3a02b1348d991259a7602ffb1d12ec1912984a68bcab0f7ccdf27a9f7"
 else
 	distfiles="
 	 ${_url}/flash_player_npapi_linux.i386.tar.gz
 	 ${_url}/flash_player_ppapi_linux.i386.tar.gz"
 	checksum="
-	 79dc936f5c1a3af91cd5a2eb31d0d4eb7bee4ebbd49239c6c8f8f8b4b98486e3
-	 e1d36f768cc6435b9a13b595a41df3f5fedfa6d1b984084163bb56f73baaff7c"
+	 4151cdbba10488978aa2baae19ec147012e17d79c59a6bb40453e35435571df8
+	 88f71944d5c08d1b36446c9c865fc82bcb89d55cd148f62afee8dd928943caf6"
 fi
 distfiles+=" ${_eula}"
 checksum+=" ${_eulacksum}"

From d9640f57badd57730e04617b2d94cde700d8eafb Mon Sep 17 00:00:00 2001
From: wundrweapon <whhacker.dcx@gmail.com>
Date: Fri, 30 Oct 2020 16:30:56 -0400
Subject: [PATCH 0243/3595] highlight: update to 3.58.

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

diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template
index 487d6195561..5bfc991799b 100644
--- a/srcpkgs/highlight/template
+++ b/srcpkgs/highlight/template
@@ -1,16 +1,16 @@
 # Template file for 'highlight'
 pkgname=highlight
-version=3.57
-revision=3
+version=3.58
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config swig perl"
-makedepends="boost-devel lua53-devel perl"
+makedepends="boost-devel lua54-devel perl"
 short_desc="Fast and flexible source code highlighter (CLI version)"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php"
 distfiles="http://www.andre-simon.de/zip/${pkgname}-${version}.tar.bz2"
-checksum=f203f75e7e35ce381d0a13270bfdc9ee53fa965c39cc137a9927b9ff0e3be913
+checksum=df80251be1f83adfc58aaad589fd9a8f9a3866b0d89b9f3c81b1696f07db45f8
 conf_files="/etc/highlight/filetypes.conf"
 
 post_extract() {
@@ -30,7 +30,7 @@ pre_build() {
 }
 
 do_check() {
-	# No check target, fails spetarcularly when asked
+	# No check target, fails spectacularly when asked
 	:
 }
 

From 1122b8a0cf3399e27e2d0d378189a02c3f980650 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Sun, 1 Nov 2020 14:27:17 -0800
Subject: [PATCH 0244/3595] json-c++: build with multi-header support

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

diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 1ec838d59a9..23c0d56fc8e 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,9 +1,10 @@
 # Template file for 'json-c++'
 pkgname=json-c++
 version=3.9.1
-revision=1
+revision=2
 wrksrc="json-${version}"
 build_style=cmake
+configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From 3a9385b9791a4e6b6da5a040e860870a2109ca9e Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Wed, 28 Oct 2020 12:54:51 -0700
Subject: [PATCH 0245/3595] OpenRCT2: update to 0.3.2

---
 srcpkgs/OpenRCT2/template | 40 ++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..5dc6d249853 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,41 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-_objects_version=1.0.15
-_titles_version=0.1.2
-version=0.2.6
-revision=3
+_objects_version=1.0.18
+_titles_version=0.1.2c
+version=0.3.2
+revision=1
 build_style=cmake
-configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")"
+configure_args="
+ -DOPENRCT2_VERSION_TAG=${version}
+ -DDOWNLOAD_TITLE_SEQUENCES=0
+ -DDOWNLOAD_OBJECTS=0
+ $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
+ $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel
- $(vopt_if multiplayer libcurl-devel) $(vopt_if multiplayer libressl-devel)"
+ libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"
 license="GPL-3.0-or-later"
 homepage="https://openrct2.io"
+# use title-sequences.zip to match CMakeLists instruction
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
- https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequence-v${_titles_version}.zip"
-checksum="0e05a709d3e07343cd72e4db4cb4f1a6d9956f8acf7da682d2a3940c3112776e
- 0171907a267c564071e587fc683bfe75f36b891a6769e0bd49a6fc46f2ae7ded
- dcb1648739b351e857e2d19fed1626bec561d5e9f4b49201568f42c475ee7e61"
-skip_extraction="objects.zip title-sequence-v${_titles_version}.zip"
+ https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
+checksum="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
+ bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+ 5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
+skip_extraction="objects.zip title-sequences.zip"
 
 replaces="OpenRCT2-data>=0"
 
-build_options="multiplayer"
-build_options_default="multiplayer"
+build_options="multiplayer scripting"
+build_options_default="multiplayer scripting"
 desc_option_multiplayer="Enable multiplayer support"
+desc_option_scripting="Enable script / plugin support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="not yet implemented"
@@ -49,5 +57,7 @@ post_extract() {
 	_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
 	mkdir -p data/object data/title
 	unzip -qd data/object "${_srcdir}/objects.zip"
-	unzip -qd data/title "${_srcdir}/title-sequence-v${_titles_version}.zip"
+	unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
+
+	vsed -i CMakeLists.txt -e "s; -Werror;;"
 }

From d02f11bbf8d75d7d1d763ee4b65109f9936845f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 5 Nov 2020 20:04:23 -0300
Subject: [PATCH 0246/3595] ngspice: update to 33.

---
 srcpkgs/ngspice/patches/windows-only.patch | 15 +++++++++++++++
 srcpkgs/ngspice/template                   |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ngspice/patches/windows-only.patch

diff --git a/srcpkgs/ngspice/patches/windows-only.patch b/srcpkgs/ngspice/patches/windows-only.patch
new file mode 100644
index 00000000000..5f661864184
--- /dev/null
+++ b/srcpkgs/ngspice/patches/windows-only.patch
@@ -0,0 +1,15 @@
+libshlwapi is Windows-only
+
+diff --git src/xspice/cmpp/Makefile.in src/xspice/cmpp/Makefile.in
+index b450e8c..2ea8716 100644
+--- src/xspice/cmpp/Makefile.in
++++ src/xspice/cmpp/Makefile.in
+@@ -753,7 +753,7 @@ ifs_yacc.c : ifs_yacc.y
+ 
+ @CROSS_COMPILING_TRUE@build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES)
+ @CROSS_COMPILING_TRUE@	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
+-@CROSS_COMPILING_TRUE@		$(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^ -lshlwapi
++@CROSS_COMPILING_TRUE@		$(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^
+ 
+ @CROSS_COMPILING_TRUE@distclean-local:
+ @CROSS_COMPILING_TRUE@	-rm -rf build
diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template
index 86dfb7d7c7d..05beffd8f84 100644
--- a/srcpkgs/ngspice/template
+++ b/srcpkgs/ngspice/template
@@ -1,6 +1,6 @@
 # Template file for 'ngspice'
 pkgname=ngspice
-version=32
+version=33
 revision=1
 build_style=gnu-configure
 configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://ngspice.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
-checksum=3cd90c4e94516d87c5b4d02a3a6405b1136b25d05c871d4fee1fd7c4c0d03ef2
+checksum=b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1
 
 post_install() {
 	vlicense COPYING

From 1aa6194696400d77d9450cc20f5203038ae8aeb1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 15:39:22 -0600
Subject: [PATCH 0247/3595] poedit: remove un-needed makedepends

---
 srcpkgs/poedit/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 4b0fe5d6cbc..4616503a942 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -6,8 +6,7 @@ build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
 makedepends="boost-devel cld2-devel db-devel enchant2-devel gtk+3-devel
- gtkspell3-devel libharfbuzz libxml2 Lucene++-devel webkit2gtk
- wxWidgets-gtk3-devel"
+ gtkspell3-devel Lucene++-devel wxWidgets-gtk3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Cross-platform gettext catalogs (.po files) editor"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 524d0390cd223f663d3949e939a7ead3d23879a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:53:28 +0200
Subject: [PATCH 0248/3595] New package: nocurses-2.0.4.

---
 common/shlibs              |  2 ++
 srcpkgs/notcurses-devel    |  1 +
 srcpkgs/notcurses-progs    |  1 +
 srcpkgs/notcurses/template | 40 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/notcurses-devel
 create mode 120000 srcpkgs/notcurses-progs
 create mode 100644 srcpkgs/notcurses/template

diff --git a/common/shlibs b/common/shlibs
index 23f84b3d796..3b56362383c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3994,3 +3994,5 @@ libbson-1.0.so.0 libbson-1.17.0_1
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libtree-sitter.so.0 tree-sitter-0.17.3_1
+libnotcurses.so.2 notcurses-2.0.4_1
+libnotcurses++.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/notcurses-devel b/srcpkgs/notcurses-devel
new file mode 120000
index 00000000000..609dfe4d9c5
--- /dev/null
+++ b/srcpkgs/notcurses-devel
@@ -0,0 +1 @@
+notcurses
\ No newline at end of file
diff --git a/srcpkgs/notcurses-progs b/srcpkgs/notcurses-progs
new file mode 120000
index 00000000000..609dfe4d9c5
--- /dev/null
+++ b/srcpkgs/notcurses-progs
@@ -0,0 +1 @@
+notcurses
\ No newline at end of file
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
new file mode 100644
index 00000000000..bb2d9419da8
--- /dev/null
+++ b/srcpkgs/notcurses/template
@@ -0,0 +1,40 @@
+# Template file for 'notcurses'
+pkgname=notcurses
+version=2.0.4
+revision=1
+build_style=cmake
+configure_args="-DUSE_STATIC=ON"
+hostmakedepends="pkg-config pandoc"
+makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel"
+depends="ncurses-base"
+short_desc="Blingful character graphics/TUI library"
+maintainer="mobinmob <mobinmob@disroot.org>"
+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=6bb38ca0affc6425cd8e248c5b81aa4281713362c45202a450a89ab751833c98
+
+notcurses-devel_package() {
+	depends="notcurses-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove /usr/lib/cmake
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/doc
+		vmove usr/share/man/man3
+	}
+}
+
+notcurses-progs_package() {
+	depends="notcurses-${version}_${revision}"
+	short_desc+=" - programs"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/notcurses
+		vmove usr/share/man/man1
+	}
+}

From 429213908b04868e337cea981b6d42f4777925bf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:54:10 +0200
Subject: [PATCH 0249/3595] New package: growlight-1.2.18.

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
new file mode 100644
index 00000000000..65e5f69d52a
--- /dev/null
+++ b/srcpkgs/growlight/template
@@ -0,0 +1,16 @@
+# Template file for 'growlight'
+pkgname=growlight
+version=1.2.18
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config pandoc"
+makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
+ nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
+ device-mapper-devel pciutils-devel zfs-devel"
+depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs"
+short_desc="Block device manager and system installation tool"
+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=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032

From 9560bda7d902a1ec062c2c6622a08cb3f9a2c84f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:54:48 +0200
Subject: [PATCH 0250/3595] New package: doctest-2.4.1.

---
 srcpkgs/doctest-devel    |  1 +
 srcpkgs/doctest/template | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/doctest-devel
 create mode 100644 srcpkgs/doctest/template

diff --git a/srcpkgs/doctest-devel b/srcpkgs/doctest-devel
new file mode 120000
index 00000000000..79086729892
--- /dev/null
+++ b/srcpkgs/doctest-devel
@@ -0,0 +1 @@
+doctest
\ No newline at end of file
diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
new file mode 100644
index 00000000000..eeb20eab623
--- /dev/null
+++ b/srcpkgs/doctest/template
@@ -0,0 +1,25 @@
+# Template file for 'doctest'
+pkgname=doctest
+version=2.4.1
+revision=1
+build_style=cmake
+short_desc="Doctest C++ testing framework"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference"
+changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
+distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
+checksum=0a0f0be21ee23e36ff6b8b9d63c06a7792e04cce342e1df3dee0e40d1e21b9f0
+
+post_install() {
+	vlicense LICENSE.txt
+}
+
+doctest-devel_package() {
+	depends="doctest-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		}
+}

From 72e38e09f7aa634acf56377b369c19be9fb9a8d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 17 Nov 2020 16:55:19 +0200
Subject: [PATCH 0251/3595] qrcodegen: enable C library build.

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

diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index 53627a2b98f..d181e9cdb52 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -1,10 +1,8 @@
 # Template file for 'qrcodegen'
 pkgname=qrcodegen
 version=1.6.0
-revision=2
+revision=3
 wrksrc="QR-Code-generator-${version}"
-build_wrksrc="cpp"
-build_style=gnu-makefile
 short_desc="QR Code generator library"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"
@@ -14,11 +12,20 @@ checksum=8acee5a77325e075b910747ad4b1fdb1491b7e22d0b8f1b5a6ea15ea08ba33a8
 
 CXXFLAGS="-fPIC"
 
+do_build() {
+	for dir in c cpp
+	do
+	cd $dir && make && cd ..
+	done
+}
+
 do_install() {
-	sed -n "/^License/,/xxxx/p" ../Readme.markdown > LICENSE
+	sed -n "/^License/,/xxxx/p" Readme.markdown > LICENSE
 	vlicense LICENSE
-	vinstall QrCode.hpp 644 usr/include/qrcodegen
-	vinstall libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+	vinstall cpp/QrCode.hpp 644 usr/include/qrcodegen
+	vinstall cpp/libqrcodegen.a 644 usr/lib libqrcodegencpp.a
+	vinstall c/qrcodegen.h 644 usr/include/qrcodegen
+	vinstall c/libqrcodegen.a 644 usr/lib
 }
 
 qrcodegen-devel_package() {

From dd28859dba941d168a6b00c5a3e021b6bd3f4b48 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:42:08 -0600
Subject: [PATCH 0252/3595] php: rebuild against libnet-snmp [ci skip]

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

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index db56578a49f..613e0215751 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.11
-revision=1
+revision=2
 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

From 538163e54ea9100c2e2d05da21a3a271583ecceb Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:36:11 -0600
Subject: [PATCH 0253/3595] collectd: rebuild against libnet-snmp

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

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index f0ff336a74d..84ce3ef4ecd 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.11.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From ad6e66f8074f3d69eed1414f9411cf3b95f1838a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:39:50 -0600
Subject: [PATCH 0254/3595] hplip: rebuild against libnet-snmp

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

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index bf66601fe64..8ebc49b7a8f 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=3
+revision=4
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="

From 63f2aa366db61f8c7afb8397dd5331626260830e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:41:01 -0600
Subject: [PATCH 0255/3595] network-ups-tools: rebuild against libnet-snmp

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

diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index cc100bbde6e..bf2e50a540e 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=10
+revision=11
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -13,7 +13,6 @@ configure_args="
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
-system_accounts="nut"
 conf_files="
 	/etc/ups/ups.conf
 	/etc/ups/upsd.users
@@ -23,10 +22,11 @@ conf_files="
 	/etc/ups/nut.conf"
 short_desc="UPS control and monitoring features (NUT)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.networkupstools.org/"
 distfiles="${homepage}source/${version%.*}/nut-${version}.tar.gz"
 checksum=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
+system_accounts="nut"
 
 nopie=yes
 build_options="cgi"

From 3df1ff28fb6c1df81eeb225a648c8f53b6afe34d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:43:24 -0600
Subject: [PATCH 0256/3595] zabbix: rebuild against libnet-snmp

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

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 05e7461a9d3..cbc49634215 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From e96290e47847e0e3eec0050a37f79ff576b54e15 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:44:28 -0600
Subject: [PATCH 0257/3595] wmnd: rebuild against libnet-snmp

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

diff --git a/srcpkgs/wmnd/template b/srcpkgs/wmnd/template
index 76eeba429a3..c922189a374 100644
--- a/srcpkgs/wmnd/template
+++ b/srcpkgs/wmnd/template
@@ -1,7 +1,7 @@
 # Template file for 'wmnd'
 pkgname=wmnd
 version=0.4.18
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_file__proc_net_dev=yes
  ac_cv_file__dev_ppp=no"

From 0dcaba9e58dbc9a74685e51447755dfd065edf75 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 2 Nov 2020 07:09:27 -0600
Subject: [PATCH 0258/3595] net-snmp: update to 5.9

[ci skip]
---
 common/shlibs             | 12 ++++++------
 srcpkgs/net-snmp/template |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3b56362383c..c414bd43177 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1102,12 +1102,12 @@ libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
 libssh2.so.1 libssh2-1.4.1_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.35 libnet-snmp-5.8_1
-libnetsnmp.so.35 libnet-snmp-5.8_1
-libnetsnmpagent.so.35 libnet-snmp-5.8_1
-libnetsnmpmibs.so.35 libnet-snmp-5.8_1
-libnetsnmptrapd.so.35 libnet-snmp-5.8_1
-libnetsnmphelpers.so.35 libnet-snmp-5.8_1
+libsnmp.so.40 libnet-snmp-5.9_1
+libnetsnmp.so.40 libnet-snmp-5.9_1
+libnetsnmpagent.so.40 libnet-snmp-5.9_1
+libnetsnmpmibs.so.40 libnet-snmp-5.9_1
+libnetsnmptrapd.so.40 libnet-snmp-5.9_1
+libnetsnmphelpers.so.40 libnet-snmp-5.9_1
 libieee1284.so.3 libieee1284-0.2.10_1
 libsane.so.1 libsane-1.0.22_1
 libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index 7b8e3185fba..b5c06106fb2 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,7 +1,7 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
-version=5.8
-revision=5
+version=5.9
+revision=1
 hostmakedepends="pkg-config unzip"
 makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Net-SNMP"
 homepage="http://www.net-snmp.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
+checksum=04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071
 
 LDFLAGS="-lpthread"
 
@@ -51,5 +51,6 @@ net-snmp-devel_package() {
 		vmove usr/include
 		vmove usr/share/man/man3
 		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
 	}
 }

From c6b52c2d36797058993a7f67d5453ffd262a4d89 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 14:51:20 -0800
Subject: [PATCH 0259/3595] atf-rk3328-bl31: update to 2.4.

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

diff --git a/srcpkgs/atf-rk3328-bl31/template b/srcpkgs/atf-rk3328-bl31/template
index b257d5fae24..89397958a62 100644
--- a/srcpkgs/atf-rk3328-bl31/template
+++ b/srcpkgs/atf-rk3328-bl31/template
@@ -1,6 +1,6 @@
 # Template file for 'atf-rk3328-bl31'
 pkgname=atf-rk3328-bl31
-version=2.3
+version=2.4
 revision=1
 archs="aarch64*"
 wrksrc="trusted-firmware-a-${version}"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-3-Clause"
 homepage="https://developer.trustedfirmware.org/dashboard/view/6/"
 distfiles="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${version}.tar.gz"
-checksum=37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21
+checksum=bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b
 nostrip=yes
 
 do_build() {

From 764726244192e702faf731f5cc0d6ad865315b22 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 1 Nov 2020 19:07:15 +0000
Subject: [PATCH 0260/3595] rock64-uboot: update to 2020.10

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

diff --git a/srcpkgs/rock64-uboot/template b/srcpkgs/rock64-uboot/template
index d0c03cb2688..625660c7706 100644
--- a/srcpkgs/rock64-uboot/template
+++ b/srcpkgs/rock64-uboot/template
@@ -1,6 +1,6 @@
 # Template file for 'rock64-uboot'
 pkgname=rock64-uboot
-version=2020.07
+version=2020.10
 revision=1
 archs="aarch64*"
 wrksrc="u-boot-${version}"
@@ -11,7 +11,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
+checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
 
 do_configure() {
 	make rock64-rk3328_defconfig

From 57cfbbccab3d831183e010976c7945ff8f927cae Mon Sep 17 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, 21 Nov 2020 22:51:09 +0700
Subject: [PATCH 0261/3595] c: remove noarch

---
 srcpkgs/c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/c/template b/srcpkgs/c/template
index 47c95d3060e..7b0086a5153 100644
--- a/srcpkgs/c/template
+++ b/srcpkgs/c/template
@@ -1,8 +1,7 @@
 # Template file for 'c'
 pkgname=c
 version=0.14
-revision=1
-archs=noarch
+revision=2
 depends="bash"
 short_desc="Compile and execute C scripts in one go!"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 22492590cbd2a21f4865d974441328bfb7355dc5 Mon Sep 17 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 0262/3595] catch2: remove noarch

---
 srcpkgs/catch2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index f8795cb6c77..ae4c9b2c38d 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,8 +1,7 @@
 # Template file for 'catch2'
 pkgname=catch2
 version=2.11.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="Catch2-${version}"
 build_style=cmake
 configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON

From 3db37e847dc4573e7ce7aec45e5acd38ee1d3113 Mon Sep 17 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 0263/3595] cdemu-client: remove noarch

---
 srcpkgs/cdemu-client/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index 36d40de4bb5..c070247bc8b 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,8 +1,7 @@
 # Template file for 'cdemu-client'
 pkgname=cdemu-client
 version=3.2.4
-revision=1
-archs=noarch
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_COMPLETIONSDIR=/usr/share/bash-completion/completions"
 hostmakedepends="python3 intltool pkg-config"

From 957ea1688f9e4872b7b1c4ad01798bd8db879274 Mon Sep 17 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 0264/3595] cdm: remove noarch

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

diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template
index ae30eaaef91..f1fb8b2f646 100644
--- a/srcpkgs/cdm/template
+++ b/srcpkgs/cdm/template
@@ -1,15 +1,14 @@
 # Template file for 'cdm'
 pkgname=cdm
 version=0.7
-revision=2
+revision=3
+depends="dialog xinit kbd xdpyinfo"
 short_desc="Console Display Manager"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-depends="dialog xinit kbd xdpyinfo"
 license="GPL-2.0-or-later"
 homepage="https://github.com/evertiro/cdm"
 distfiles="https://github.com/evertiro/cdm/archive/${version}.tar.gz"
 checksum=530042165ce65cdff3ec62ba9f077d0e8c6744c13f5d449d84fe2506a79d2e56
-archs=noarch
 
 do_install() {
 	sed -i 's| /| $PKGDESTDIR/|g' install.sh

From 286437759c992c0b1e71d65d4cfd4de2c49d196d Mon Sep 17 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 0265/3595] cereal: remove noarch

---
 srcpkgs/cereal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cereal/template b/srcpkgs/cereal/template
index c454ed85833..8588f1ee882 100644
--- a/srcpkgs/cereal/template
+++ b/srcpkgs/cereal/template
@@ -1,8 +1,7 @@
 # Template file for 'cereal'
 pkgname=cereal
 version=1.3.0
-revision=1
-archs=noarch
+revision=2
 build_style=cmake
 configure_args="-DSKIP_PORTABILITY_TEST=1 -DTHREAD_SAFE=ON -DWITH_WERROR=OFF"
 short_desc="Header-only C++ serialization library"

From 0ce8fe2487b705c4f2d560fc63d80006b7986b34 Mon Sep 17 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, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 0266/3595] chatty: remove noarch

---
 srcpkgs/chatty/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 16bbc44096d..00573e1c89f 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,8 +1,7 @@
 # Template file for 'chatty'
 pkgname=chatty
 version=0.12
-revision=1
-archs=noarch
+revision=2
 hostmakedepends="gradle"
 depends="virtual?java-runtime"
 short_desc="Twitch Chat Client for Desktop"

From 83dbfe72b84308967581e2e5ae20e11193c42cc7 Mon Sep 17 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 0267/3595] cldr-emoji-annotation: remove noarch

---
 srcpkgs/cldr-emoji-annotation/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cldr-emoji-annotation/template b/srcpkgs/cldr-emoji-annotation/template
index 7910b83971b..2ce6e53f4e1 100644
--- a/srcpkgs/cldr-emoji-annotation/template
+++ b/srcpkgs/cldr-emoji-annotation/template
@@ -1,9 +1,8 @@
 # Template file for 'cldr-emoji-annotation'
 pkgname=cldr-emoji-annotation
 version=36.12.120191002.0
-revision=1
+revision=2
 _tag=${version%.*}_${version##*.}
-archs=noarch
 wrksrc="${pkgname}-${_tag}"
 build_style=gnu-configure
 short_desc="Emoji annotation files in CLDR"

From 54ce8762e5ffa21b7dbfb5b22ca45394175eb686 Mon Sep 17 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 0268/3595] clearlooks-phenix-darkpurpy-theme: remove noarch

---
 srcpkgs/clearlooks-phenix-darkpurpy-theme/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
index a2d541c8896..bbc8c60559e 100644
--- a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
+++ b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
@@ -1,10 +1,9 @@
 # Template file for 'clearlooks-phenix-darkpurpy-theme'
 pkgname=clearlooks-phenix-darkpurpy-theme
 version=7.0.2
-revision=1
+revision=2
 _devuan_rel="1+devuan2.0"
 build_style=fetch
-archs=noarch
 depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
 short_desc="Dark-purpified GTK3 port of Clearlooks theme"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,4 +18,3 @@ do_install() {
 	vmkdir usr/share/themes
 	vcopy usr/share/themes/Clearlooks-Phenix-DarkPurpy usr/share/themes
 }
-

From 91cc9369d3774ee5d8db3e6ed9a9e5064446d9fd Mon Sep 17 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 0269/3595] clerk: remove noarch

---
 srcpkgs/clerk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/clerk/template b/srcpkgs/clerk/template
index a04c6f2cef6..cad10f86a94 100644
--- a/srcpkgs/clerk/template
+++ b/srcpkgs/clerk/template
@@ -1,8 +1,7 @@
 # Template file for 'clerk'
 pkgname=clerk
 version=4.0.5
-revision=1
-archs=noarch
+revision=2
 depends="rofi fzf tmux mpc perl-Net-MPD perl-Data-MessagePack perl-File-Slurper
 perl-Config-Simple perl-Try-Tiny perl-IPC-Run perl-HTTP-Date perl-Data-Section-Simple"
 short_desc="MPD client written in Perl using rofi or fzf"

From 8373c9cb71088c892e45a99338c3f0b78c9ad4db Mon Sep 17 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, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 0270/3595] cloc: remove noarch

---
 srcpkgs/cloc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index 00cf43ef4b1..cf2d1f35d3f 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,8 +1,7 @@
 # Template file for 'cloc'
 pkgname=cloc
 version=1.88
-revision=1
-archs=noarch
+revision=2
 hostmakedepends="perl"
 depends="perl"
 short_desc="Count Lines of Code"

From 4062300fa0c1e6f1679aa52fa2c12a9ae9624421 Mon Sep 17 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 0271/3595] clyrics: remove noarch

---
 srcpkgs/clyrics/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template
index 5a0144c5b30..955aaedc7c3 100644
--- a/srcpkgs/clyrics/template
+++ b/srcpkgs/clyrics/template
@@ -1,8 +1,7 @@
 # Template file for 'clyrics'
 pkgname=clyrics
 version=0.12
-revision=1
-archs=noarch
+revision=2
 depends="perl-LWP-Protocol-https perl-WWW-Mechanize"
 short_desc="Extensible lyrics fetcher, with daemon support for cmus and mocp"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6e2543023818b7cf16c9b7bbe9eae7d435439923 Mon Sep 17 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 0272/3595] cmc: remove noarch

---
 srcpkgs/cmc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cmc/template b/srcpkgs/cmc/template
index 34a50561d1d..d94d241d7f5 100644
--- a/srcpkgs/cmc/template
+++ b/srcpkgs/cmc/template
@@ -1,8 +1,7 @@
 # Template file for 'cmc'
 pkgname=cmc
 version=1.1.4
-revision=1
-archs=noarch
+revision=2
 short_desc="SSH ControlMaster Controller"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"

From b828088a7bae99d8083ec9aca710cce5ef14323f Mon Sep 17 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, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 0273/3595] collectl: remove noarch

---
 srcpkgs/collectl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index aec4b83ff46..59af99c7a5d 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,8 +1,7 @@
 # Template file for 'collectl'
 pkgname=collectl
 version=4.3.1
-revision=1
-archs=noarch
+revision=2
 conf_files="/etc/collectl.conf"
 depends="perl perl-Term-ReadKey"
 short_desc="Collects data that describes the current system status"

From daa37d23641acba2aece3aa1296ed90932e403c4 Mon Sep 17 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 0274/3595] compiz-bcop: remove noarch

---
 srcpkgs/compiz-bcop/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/compiz-bcop/template b/srcpkgs/compiz-bcop/template
index c1a82cb881b..7cc20653931 100644
--- a/srcpkgs/compiz-bcop/template
+++ b/srcpkgs/compiz-bcop/template
@@ -1,8 +1,7 @@
 # Template file for 'compiz-bcop'
 pkgname=compiz-bcop
 version=0.8.18
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool libtool pkg-config libxslt"
 makedepends="libxslt-devel"

From dc4116187d505e1b673dee26fd2cbe155bbd0240 Mon Sep 17 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 0275/3595] coreboot-utils: remove noarch

---
 srcpkgs/coreboot-utils/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index e6c57472ea1..8368dec2969 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
 version=4.12
-revision=1
+revision=2
 archs="i686* x86_64*"
 wrksrc="coreboot-${version}"
 build_wrksrc="util"
@@ -32,7 +32,6 @@ do_install() {
 }
 
 coreboot-utils-me_cleaner_package() {
-	archs=noarch
 	python_version=3
 	depends="python3"
 	short_desc="Tool for partial deblobbing Intel ME/TXE firmware images"

From afa9b766b76449e25460186eed49645cf674d32c Mon Sep 17 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 0276/3595] couchpotato: remove noarch

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

diff --git a/srcpkgs/couchpotato/template b/srcpkgs/couchpotato/template
index 3d7e27004d1..5c3d743442a 100644
--- a/srcpkgs/couchpotato/template
+++ b/srcpkgs/couchpotato/template
@@ -1,8 +1,7 @@
 # Template file for 'couchpotato'
 pkgname=couchpotato
 version=3.0.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="CouchPotatoServer-build-${version}"
 pycompile_dirs="/usr/share/couchpotato"
 make_dirs="
@@ -14,12 +13,12 @@ license="GPL-3.0-or-later"
 homepage="http://couchpota.to"
 distfiles="https://github.com/RuudBurger/CouchPotatoServer/archive/build/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=f08f9c6ac02f66c6667f17ded1eea4c051a62bbcbadd2a8673394019878e92f7
-python_version=2 #unverified
+python_version=2
 couchpotato_homedir="/var/lib/couchpotato"
 system_accounts="couchpotato"
 
 do_install() {
 	vmkdir usr/share/couchpotato
-	mv * ${DESTDIR}/usr/share/couchpotato
+	vcopy "*" usr/share/couchpotato
 	vsv couchpotato
 }

From 963ead9a0cab261dd2ae9fa304d36bc09f4eb38a Mon Sep 17 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 0277/3595] create_ap: remove noarch

---
 srcpkgs/create_ap/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/create_ap/template b/srcpkgs/create_ap/template
index 481ba622def..fb4d5dc37a8 100644
--- a/srcpkgs/create_ap/template
+++ b/srcpkgs/create_ap/template
@@ -1,8 +1,7 @@
 # Template file for 'create_ap'
 pkgname=create_ap
 version=0.4.6
-revision=2
-archs=noarch
+revision=3
 conf_files="/etc/create_ap.conf"
 build_style=gnu-makefile
 depends="bash dnsmasq hostapd iproute2 iptables iw procps-ng util-linux"

From 5e892759a026a77e8dd437ef5c049cb3a0d91dc1 Mon Sep 17 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, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 0278/3595] culmus: remove noarch

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

diff --git a/srcpkgs/culmus/template b/srcpkgs/culmus/template
index dc6599990ef..68186bb5e60 100644
--- a/srcpkgs/culmus/template
+++ b/srcpkgs/culmus/template
@@ -1,10 +1,9 @@
 # Template file for 'culmus'
 pkgname=culmus
 version=0.133
-revision=1
-archs=noarch
+revision=2
 depends="font-util"
-short_desc="A collection of Type1 and TrueType free Hebrew fonts"
+short_desc="Collection of Type1 and TrueType free Hebrew fonts"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://culmus.sourceforge.net/"

From db1aa84a8dd7f593c81615f48b3716881c24a11e Mon Sep 17 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, 21 Nov 2020 22:51:14 +0700
Subject: [PATCH 0279/3595] cycle: remove noarch

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

diff --git a/srcpkgs/cycle/template b/srcpkgs/cycle/template
index 58649da6482..05008b6047d 100644
--- a/srcpkgs/cycle/template
+++ b/srcpkgs/cycle/template
@@ -1,8 +1,7 @@
 # Template file for 'cycle'
 pkgname=cycle
 version=0.3.2
-revision=1
-archs=noarch
+revision=2
 pycompile_dirs="usr/share/cycle"
 hostmakedepends="python"
 depends="wxPython"
@@ -12,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/jose1711/cycle"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=6ca5a8191653d435ed04968b91b4a52c8e0d3d90d31d2c008aba1e9edcc1adc9
-python_version=2 #unverified
+python_version=2
 
 do_install() {
 	# Program

From 72f57f6aa7f71c566e14c00fac4a16c8f78e17f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 21 Nov 2020 22:10:59 -0300
Subject: [PATCH 0280/3595] Revert "djview: mark broken temporarily."

This reverts commit 10838be7ab0122e3855c6c524c9a7f67973de84a.
---
 srcpkgs/djview/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index c7b0cd84bcf..136bcced9fb 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -19,13 +19,6 @@ if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6l-musl|armv7l-musl|x86_64-musl)
-		# error while fetching with xbps-fetch
-		broken="djview-4.12.tar.gz: Temporary Redirect"
-		;;
-esac
-
 post_extract() {
 	vsed -i -e '/Exec/s/djview4/djview/' \
 		-e '/StartupWMClass/s/Djview4/DjView/' \

From 2855b9d1fde86cb643b283b5d7a6669e50e3ccd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 0281/3595] deerportal: remove noarch

---
 srcpkgs/deerportal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/deerportal/template b/srcpkgs/deerportal/template
index c027c258e68..d38900ff36e 100644
--- a/srcpkgs/deerportal/template
+++ b/srcpkgs/deerportal/template
@@ -1,7 +1,7 @@
 # Template file for 'deerportal'
 pkgname=deerportal
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 makedepends="SFML-devel"
 depends="deerportal-data"
@@ -14,7 +14,6 @@ checksum=a79a6286c9be1c6073f5d8fe79e45b309425f597d0532d2a042cd8369f57725d
 
 deerportal-data_package() {
 	short_desc+=" - data files"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/games
 	}

From fd88e22c7cda7611462ec306a7d9c912e8e4b425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 0282/3595] deheader: remove noarch

---
 srcpkgs/deheader/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index f3809a35a44..6b3a54eaf11 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -1,9 +1,8 @@
 # Template file for 'deheader'
 pkgname=deheader
 version=1.6
-revision=3
+revision=4
 create_wrksrc=yes
-archs=noarch
 hostmakedepends="tar"
 depends="python"
 short_desc="C and C++ header analyzer"

From 26181ac980beaed707def3635d8589d0192c324e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:42 +0700
Subject: [PATCH 0283/3595] dehydrated: remove noarch

---
 srcpkgs/dehydrated/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/dehydrated/template b/srcpkgs/dehydrated/template
index c7b3ce7abb9..b624b1fe226 100644
--- a/srcpkgs/dehydrated/template
+++ b/srcpkgs/dehydrated/template
@@ -1,8 +1,7 @@
 # Template file for 'dehydrated'
 pkgname=dehydrated
 version=0.6.5
-revision=1
-archs=noarch
+revision=2
 depends="curl"
 short_desc="Acme client implemented as a shell-script – just add water"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 54485182cc3eccbd3a8ee694f48dbdd6fe439c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 0284/3595] dex: remove noarch

---
 srcpkgs/dex/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/dex/template b/srcpkgs/dex/template
index 88b5552b070..1279d5df366 100644
--- a/srcpkgs/dex/template
+++ b/srcpkgs/dex/template
@@ -1,8 +1,7 @@
 # Template file for 'dex'
 pkgname=dex
 version=0.8.0
-revision=2
-archs=noarch
+revision=3
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 hostmakedepends="python3-Sphinx"

From 24ea9c35573bb60f4f014dd2afbd939637c46197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 0285/3595] dhcpcd-gtk: remove noarch

---
 srcpkgs/dhcpcd-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 80f03c51f8a..08cd8a90dbc 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=1
+revision=2
 wrksrc=dhcpcd-ui-${version}
 build_style=gnu-configure
 configure_args="--with-gtk --with-icons --with-notification"
@@ -28,7 +28,6 @@ post_install() {
 }
 
 dhcpcd-icons_package() {
-	archs=noarch
 	short_desc+=" - icon set"
 	depends="hicolor-icon-theme"
 	replaces="dhcpcd-gtk<0.7.4"

From 7f2768e1c038a4587805ca96c6211340284e43bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 0286/3595] ditaa: remove noarch

---
 srcpkgs/ditaa/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ditaa/template b/srcpkgs/ditaa/template
index c7978f18bd4..8f501a0d452 100644
--- a/srcpkgs/ditaa/template
+++ b/srcpkgs/ditaa/template
@@ -1,8 +1,7 @@
 # Template file for 'ditaa'
 pkgname=ditaa
 version=0.11.0
-revision=1
-archs=noarch
+revision=2
 create_wrksrc=yes
 build_style=fetch
 depends="virtual?java-environment"

From 13a1eb57ab3c1bdb5b0a2d2770b0c6b8e92896d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 0287/3595] dkimproxy: remove noarch

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

diff --git a/srcpkgs/dkimproxy/template b/srcpkgs/dkimproxy/template
index de0eec306ba..bab8cee6633 100644
--- a/srcpkgs/dkimproxy/template
+++ b/srcpkgs/dkimproxy/template
@@ -1,21 +1,19 @@
 # Template file for 'dkimproxy'
 pkgname=dkimproxy
 version=1.4.1
-revision=1
+revision=2
 build_style=gnu-configure
-# dkimproxy is written in perl, so noarch
-archs=noarch
 hostmakedepends="perl perl-Net-Server perl-Mail-DKIM"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
-system_accounts="_dkim"
-conf_files="/etc/dkimproxy_in.conf /etc/dkimproxy_out.conf"
 short_desc="SMTP-proxy that signs and/or verifies emails, using DKIM"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://dkimproxy.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/dkimproxy/dkimproxy-${version}.tar.gz"
 checksum=e5345a1d3cefd32d1fb0face9fa73490118132767253b0ce643463f1e86185bd
+system_accounts="_dkim"
+conf_files="/etc/dkimproxy_in.conf /etc/dkimproxy_out.conf"
 
 post_install() {
 	vsconf ${DESTDIR}/etc/dkimproxy_in.conf.example

From 47c14eecc67e05c8d3b3a325f06132fe99443b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 0288/3595] dreampie: remove noarch

---
 srcpkgs/dreampie/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/dreampie/template b/srcpkgs/dreampie/template
index edd0f48298b..002f11f842e 100644
--- a/srcpkgs/dreampie/template
+++ b/srcpkgs/dreampie/template
@@ -1,10 +1,8 @@
 # Template file for 'dreampie'
 pkgname=dreampie
 version=1.2.1
-revision=2
-archs=noarch
+revision=3
 build_style=python2-module
-pycompile_module="dreampielib"
 hostmakedepends="python-setuptools"
 depends="pygtksourceview"
 short_desc="The Python shell you've always dreamed about"

From 7512ed0ec214e5f55225293240ffca091ef459a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:43 +0700
Subject: [PATCH 0289/3595] dstat: remove noarch

---
 srcpkgs/dstat/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/dstat/template b/srcpkgs/dstat/template
index 3ec983e85db..43a7efd6ded 100644
--- a/srcpkgs/dstat/template
+++ b/srcpkgs/dstat/template
@@ -1,8 +1,7 @@
 # Template file for 'dstat'
 pkgname=dstat
 version=0.7.4
-revision=2
-archs=noarch
+revision=3
 makedepends="python3"
 depends="python3-six"
 short_desc="Versatile tool for generating system resource statistics"

From d33e40d94be264c60428f3b213a297d0a7fcfe60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 08:25:44 +0700
Subject: [PATCH 0290/3595] durden: remove noarch

---
 srcpkgs/durden/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/durden/template b/srcpkgs/durden/template
index 54a4bc1759b..d150a07ce5e 100644
--- a/srcpkgs/durden/template
+++ b/srcpkgs/durden/template
@@ -1,7 +1,7 @@
 # Template file for 'durden'
 pkgname=durden
 version=0.5
-revision=1
+revision=2
 depends="aclip aloadimage"
 short_desc="Desktop environment for Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
@@ -9,7 +9,6 @@ license="BSD-3-Clause"
 homepage="http://durden.arcan-fe.com/"
 distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz"
 checksum=f0cb0cdc6d16b4807efab5b6152b9f26813dccd2d66af5f1d80494769f840915
-archs=noarch
 
 do_install() {
 	vbin distr/durden

From 1fc0cfeba1bb732628db42963508356b4c8b4657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:54 +0700
Subject: [PATCH 0291/3595] i3lock-fancy: remove noarch

---
 srcpkgs/i3lock-fancy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/i3lock-fancy/template b/srcpkgs/i3lock-fancy/template
index 5bb3502b4ed..a9cdfb0d7d2 100644
--- a/srcpkgs/i3lock-fancy/template
+++ b/srcpkgs/i3lock-fancy/template
@@ -1,8 +1,7 @@
 # Template file for 'i3lock-fancy'
 pkgname=i3lock-fancy
 version=0.2
-revision=1
-archs=noarch
+revision=2
 depends="util-linux bash ImageMagick i3lock wmctrl gawk"
 short_desc="Fancy lockscreen using i3lock"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6bd9c6c48babac9f2d7b926ad21b59309b253dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:54 +0700
Subject: [PATCH 0292/3595] ice-ssb: remove noarch

---
 srcpkgs/ice-ssb/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template
index c06941257c1..f0cac9cafc4 100644
--- a/srcpkgs/ice-ssb/template
+++ b/srcpkgs/ice-ssb/template
@@ -1,8 +1,7 @@
 # Template file for 'ice-ssb'
 pkgname=ice-ssb
 version=6.0.8
-revision=1
-archs=noarch
+revision=2
 wrksrc="ice-$version"
 depends="gtk+3 python3-BeautifulSoup4 python3-gobject python3-requests"
 short_desc="Site Specific Browsers (SSBs) manager"

From 83e70c1854c52def855ff90206dbe2d9943c6b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0293/3595] icedtea-sound: remove noarch

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

diff --git a/srcpkgs/icedtea-sound/template b/srcpkgs/icedtea-sound/template
index 4ad965c6806..ceccff2fd94 100644
--- a/srcpkgs/icedtea-sound/template
+++ b/srcpkgs/icedtea-sound/template
@@ -1,21 +1,20 @@
 # Template file for 'icedtea-sound'
 pkgname=icedtea-sound
 version=1.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-jdk-home=/usr/lib/jvm/java-1.8-openjdk"
 hostmakedepends="openjdk8 zip perl pkg-config"
 makedepends="pulseaudio-devel"
 short_desc="Plugins for javax.sound"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-only WITH Classpath-exception-2.0"
+license="GPL-2.0-only + Classpath-exception-2.0"
 homepage="http://icedtea.classpath.org/download/source/"
 distfiles="http://icedtea.classpath.org/download/source/${pkgname}-${version}.tar.xz"
 checksum=6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
 
 icedtea-sound-doc_package() {
 	short_desc+=" - docs"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 55ad2150c28c81cb7c856602618ad06afb54e31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0294/3595] icon-naming-utils: remove noarch

---
 srcpkgs/icon-naming-utils/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template
index f069d604e37..5a693266459 100644
--- a/srcpkgs/icon-naming-utils/template
+++ b/srcpkgs/icon-naming-utils/template
@@ -1,8 +1,7 @@
 # Template file for 'icon-naming-utils'
 pkgname=icon-naming-utils
 version=0.8.90
-revision=5
-archs=noarch
+revision=6
 build_style=gnu-configure
 hostmakedepends="perl-XML-Simple"
 makedepends="${hostmakedepends}"

From 5bde90841cd31bc5e8138cce2171f16c2d2f63ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0295/3595] imgp: remove noarch

---
 srcpkgs/imgp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/imgp/template b/srcpkgs/imgp/template
index 872b3db406c..c81e3f15101 100644
--- a/srcpkgs/imgp/template
+++ b/srcpkgs/imgp/template
@@ -1,8 +1,7 @@
 # Template file for 'imgp'
 pkgname=imgp
 version=2.7
-revision=2
-archs=noarch
+revision=3
 build_style=gnu-makefile
 depends="python3-Pillow"
 short_desc="Multi-core batch image resizer and rotator"

From 2d03483e8a2e47662a5e838029253a3179d415e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0296/3595] indic-otf: remove noarch

---
 srcpkgs/indic-otf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/indic-otf/template b/srcpkgs/indic-otf/template
index 4f37e66f3ce..fc5c25b135a 100644
--- a/srcpkgs/indic-otf/template
+++ b/srcpkgs/indic-otf/template
@@ -1,8 +1,7 @@
 # Template file for 'indic-otf'
 pkgname=indic-otf
 version=0.2
-revision=3
-archs=noarch
+revision=4
 wrksrc=indic
 build_wrksrc=OpenType
 makedepends="font-util xbps-triggers"

From 51a64edba76e2a77c2e18c00f289bc154c00d0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0297/3595] indicator-doom-cpu: remove noarch

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

diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template
index 33158f90a16..a856d82be19 100644
--- a/srcpkgs/indicator-doom-cpu/template
+++ b/srcpkgs/indicator-doom-cpu/template
@@ -1,12 +1,11 @@
 # Template file for 'indicator-doom-cpu'
 pkgname=indicator-doom-cpu
 version=1.0.1
-revision=1
-archs=noarch
+revision=2
 depends="python-gobject"
 short_desc="CPU load indicator showing the dying face from the video game DOOM"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://github.com/ebruck/indicator-doom-cpu"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=87dcb082c5032518b2616c85967ac92cf3618b6e0276266ec413537b6256c7d5

From 6ff989ea8653543fb1cddae3d9cb0bbd507c677b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0298/3595] iniparser: remove noarch

---
 srcpkgs/iniparser/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index 63eb336c7ea..a780d47dbdd 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -1,7 +1,7 @@
 # Template file for 'iniparser'
 pkgname=iniparser
 version=4.1
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="doxygen chrpath"
 short_desc="Free stand-alone ini file parsing library"
@@ -58,14 +58,12 @@ iniparser-devel_package() {
 }
 iniparser-doc_package() {
 	short_desc+=" - documentation"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc/iniparser
 	}
 }
 iniparser-example_package() {
 	short_desc+=" - example code"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/iniparser/example
 	}

From b5b9ea5dd388fd650e537934e461c8cdcbf4a5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0299/3595] io.elementary.stylesheet: remove noarch

---
 srcpkgs/io.elementary.stylesheet/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 6b40406712d..791bca04709 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,8 +1,7 @@
 # Template file for 'io.elementary.stylesheet'
 pkgname=io.elementary.stylesheet
 version=5.4.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="stylesheet-${version}"
 build_style=meson
 short_desc="GTK Stylesheet for elementary OS"

From e37f7c9ec5de6cf17df370dac8ba2f46348fe2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:55 +0700
Subject: [PATCH 0300/3595] ioprof: remove noarch

---
 srcpkgs/ioprof/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ioprof/template b/srcpkgs/ioprof/template
index 32b327b4677..033cf9ee518 100644
--- a/srcpkgs/ioprof/template
+++ b/srcpkgs/ioprof/template
@@ -1,8 +1,7 @@
 # Template file for 'ioprof'
 pkgname=ioprof
 version=2.0.4
-revision=2
-archs=noarch
+revision=3
 build_style=fetch
 depends="perl blktrace"
 short_desc="Linux I/O profiler"

From 754428ddb1739adefe2821c7f7acb3991f0472fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:05:56 +0700
Subject: [PATCH 0301/3595] ipcalc: remove noarch

---
 srcpkgs/ipcalc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ipcalc/template b/srcpkgs/ipcalc/template
index 6a35f924f0d..5f33dce9905 100644
--- a/srcpkgs/ipcalc/template
+++ b/srcpkgs/ipcalc/template
@@ -1,8 +1,7 @@
 # Template file for 'ipcalc'
 pkgname=ipcalc
 version=0.41
-revision=2
-archs=noarch
+revision=3
 depends="perl"
 short_desc="Calculator for IPv4 addresses"
 maintainer="allan <mail@may.mooo.com>"

From 6235b9f7fb2bcaf5c38d3a942e98df2056111681 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 19 Nov 2020 10:08:12 +0100
Subject: [PATCH 0302/3595] synapse: update to 1.23.0.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index a1dec681ede..0d11c75cfa7 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.21.2
+version=1.23.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=ec7073befcda697428c4d634c7a8637ea7d1b01639b3a943d72821ba8110a0bf
+checksum=afa86ea1332a52d09552ea5825567f910b304d4684692fa8325cefec105b2b4c
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 113cc99768cd994fa5d0a809423f02b345f1056f Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 19 Oct 2020 09:37:39 -0700
Subject: [PATCH 0303/3595] New package: wlclock-1.0.0

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

diff --git a/srcpkgs/wlclock/template b/srcpkgs/wlclock/template
new file mode 100644
index 00000000000..65eb3325ade
--- /dev/null
+++ b/srcpkgs/wlclock/template
@@ -0,0 +1,14 @@
+# Template file for 'wlclock'
+pkgname=wlclock
+version=1.0.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="cairo-devel wayland-devel wayland-protocols"
+short_desc="Digital analog clock for Wayland desktops"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~leon_plickat/wlclock/"
+distfiles="https://git.sr.ht/~leon_plickat/wlclock/archive/v${version}.tar.gz"
+checksum=cdbc32eb1f68614a09e430eaa24578e4d58475ed8988871fce20a669898a48db

From 692c20784444be0cfa1eae08de67398cf121d32d Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 22 Oct 2020 16:59:47 -0700
Subject: [PATCH 0304/3595] clipmenu: update to 6.2.0.

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

diff --git a/srcpkgs/clipmenu/template b/srcpkgs/clipmenu/template
index a7302993521..2befe984790 100644
--- a/srcpkgs/clipmenu/template
+++ b/srcpkgs/clipmenu/template
@@ -1,14 +1,14 @@
 # Template file for 'clipmenu'
 pkgname=clipmenu
-version=6.1.0
-revision=2
+version=6.2.0
+revision=1
 depends="bash dmenu clipnotify xsel"
 short_desc="Clipboard management using dmenu"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://github.com/cdown/clipmenu"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=1b5da22fac3bbee254267f9274746f747019c5f9a1f53cde0ddc1591053d2342
+checksum=15830429dbe78da8168e71c6e1cc9fccf5c4d03ebae8ccefb0a5dbaa98adbbb8
 
 do_install() {
 	vbin clipdel

From ca0f4f3398507e77cd016bf9ad86d8c856e34fb0 Mon Sep 17 00:00:00 2001
From: Justin Berthault <justin.berthault@zaclys.net>
Date: Thu, 22 Oct 2020 21:50:02 +0200
Subject: [PATCH 0305/3595] picard: update to 2.5

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

diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 53f9daa8fdb..513ab6356cf 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,7 +1,7 @@
 # Template file for 'picard'
 pkgname=picard
-version=2.3.2
-revision=2
+version=2.5
+revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 make_install_args="--disable-autoupdate"
@@ -15,4 +15,4 @@ license="GPL-2.0-or-later"
 homepage="https://picard.musicbrainz.org/"
 changelog="https://picard.musicbrainz.org/changelog/"
 distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=a91d9f11f2e5a6a0c579e0749e3a3919694ddeef0f251c1dded32e9331b1b0b7
+checksum=f9df2882c1fcb46d69c89c87485c77bcff7d9c738b004694fa0fb31280677963

From 955938d8e9338bed2d2eebaf9864c89311435adb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 22 Oct 2020 19:11:08 +0300
Subject: [PATCH 0306/3595] butt: update to 0.1.25, add changelog.

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

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 98ce59064c2..6e67147ec84 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,6 +1,6 @@
 # Template file for 'butt'
 pkgname=butt
-version=0.1.22
+version=0.1.25
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,5 +10,6 @@ short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 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=71e7fcd89d97f803f05197caa743de4fcf8ab67ec3f3af0a54c2e895d660f62c
+checksum=7c9f44227584e30040315a5c86419bf3e654bd3523634d34b18c9017206334cb

From 6ac7c0ecd1b4fb5028814e3193dfc20b3a66586a Mon Sep 17 00:00:00 2001
From: Rich Gannon <rich@rchgannon.net>
Date: Wed, 14 Oct 2020 23:27:24 -0400
Subject: [PATCH 0307/3595] glusterfs: update to 8.1

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

diff --git a/common/shlibs b/common/shlibs
index c414bd43177..5fab7ad521b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1486,6 +1486,7 @@ libgfchangelog.so.0 libglusterfs-3.8.0_1
 libgfrpc.so.0 libglusterfs-3.8.0_1
 libgfxdr.so.0 libglusterfs-3.8.0_1
 libgfapi.so.0 libglusterfs-3.8.0_1
+libglusterd.so.0 libglusterfs-8.1_1
 libsnapper.so.5 libsnapper-0.4.1_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 8745513af64..cfdd7d4ab93 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,6 +1,6 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=7.8
+version=8.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
@@ -17,7 +17,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=ee83f96a7caf10596231dbf2f1e80f257629067485d4ef26216c69bb4a3ed545
+checksum=89bc6d9c933119924f19f2681706883eed331efe0f8a20a2e6b12a290ca00d32
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;
@@ -36,7 +36,6 @@ glusterfs-server_package() {
 		/etc/glusterfs/glusterd.vol"
 	pkg_install() {
 		vmove etc/glusterfs
-		vmove usr/bin/glfsheal
 		vmove usr/bin/gluster
 		vmove usr/bin/glusterd
 		vmove usr/share/man/man8/gluster.8

From 1289964050723ed07394293d3ebcf6ad0c406c7e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 13 Oct 2020 22:32:18 -0700
Subject: [PATCH 0308/3595] New package: pppconfig-2.3.24

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

diff --git a/srcpkgs/pppconfig/template b/srcpkgs/pppconfig/template
new file mode 100644
index 00000000000..a05f7265291
--- /dev/null
+++ b/srcpkgs/pppconfig/template
@@ -0,0 +1,21 @@
+# Template file for 'pppconfig'
+pkgname=pppconfig
+version=2.3.24
+revision=1
+depends="newt ppp"
+short_desc="Text menu based utility for configuring ppp"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://packages.debian.org/sid/pppconfig"
+distfiles="http://deb.debian.org/debian/pool/main/p/pppconfig/pppconfig_$version.tar.gz"
+checksum=8d7e75b5be044cfae1ed3b0096fea75cee183328b9ace7d949381d89f3e6401d
+make_dirs="
+ /etc/chatscripts 0755 root root
+ /etc/ppp/resolv 0755 root root"
+
+do_install() {
+	vbin pppconfig
+	vinstall 0dns-up 0755 etc/ppp/ip-up.d/
+	vinstall 0dns-down 0755 etc/ppp/ip-down.d/
+	vman man/pppconfig.8
+}

From 520d690b45b1013623ee404a84f6d897655b6235 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 9 Oct 2020 16:46:48 -0500
Subject: [PATCH 0309/3595] New package: fuzzypkg-1.0.2

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

diff --git a/srcpkgs/fuzzypkg/template b/srcpkgs/fuzzypkg/template
new file mode 100644
index 00000000000..6243aa202a7
--- /dev/null
+++ b/srcpkgs/fuzzypkg/template
@@ -0,0 +1,25 @@
+# Template file for 'fuzzypkg'
+pkgname=fuzzypkg
+version=1.0.2
+revision=1
+depends="bash"
+short_desc="XBPS fuzzy package manager"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="MIT"
+homepage="https://github.com/zdykstra/fuzzypkg"
+distfiles="https://github.com/zdykstra/fuzzypkg/archive/v${version}.tar.gz"
+checksum=f9aa5bd0d679f43d7d78654ba579fa460c5625b4504c4221a35a90623d59d90f
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*)
+		depends+=" fzf"
+		;;
+	*)
+		depends+=" skim"
+		;;
+esac
+
+do_install() {
+	vlicense LICENSE
+	vbin fuzzypkg
+}

From 93b4fc0b77bc3387ffd89d4bbe1f247e410c84bf Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 8 Oct 2020 20:41:22 +1100
Subject: [PATCH 0310/3595] cinnamon-settings-daemon: various template
 cleanups.

- fix the homepage.
- remove the changlog which is not kept up-to-date and is inconsistent
  between cinnamon templates AND upstream repos.
- other style fixes.
---
 srcpkgs/cinnamon-settings-daemon/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index f9a38da22f5..70f76130dd2 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,10 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
 version=4.6.4
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
-configure_args=" --disable-static --disable-schemas-compile"
+configure_args="--disable-static --disable-schemas-compile"
 hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
  gobject-introspection intltool libtool pkg-config"
 makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -14,8 +14,7 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Cinnamon Settings Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
-changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
+homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
 checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
 

From 61774feb09c3f1689539b53d3cb6dc5a237f07ea Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Nov 2020 01:00:39 +0200
Subject: [PATCH 0311/3595] gettext: update to 0.21.

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

diff --git a/common/shlibs b/common/shlibs
index 5fab7ad521b..9347a28eb41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -185,8 +185,8 @@ libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
 libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.2.so gettext-libs-0.20.2_1
-libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
+libgettextlib-0.21.so gettext-libs-0.21_1
+libgettextsrc-0.21.so gettext-libs-0.21_1
 libgettextpo.so.0 gettext-libs-0.17_1
 libtextstyle.so.0 gettext-libs-0.20.1_1
 libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 391ceceb9ee..4e0667c1b8c 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
 # Template file for 'gettext'
 pkgname=gettext
-version=0.20.2
-revision=2
+version=0.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
  --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gettext/"
 changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
+checksum=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
 
 case "$XBPS_TARGET_MACHINE" in
 	# force libintl

From bd2167d8a98ec50d30b1f1898dcf23b70d140c16 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 5 Oct 2020 11:27:47 +1100
Subject: [PATCH 0312/3595] New package: instaloader-4.5.3.

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

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
new file mode 100644
index 00000000000..034df7073f7
--- /dev/null
+++ b/srcpkgs/instaloader/template
@@ -0,0 +1,27 @@
+# Template file for 'instaloader'
+pkgname=instaloader
+version=4.5.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-idna python3-chardet
+ python3-certifi"
+checkdepends="${depends}"
+short_desc="Download pictures with metadata from Instagram"
+maintainer="fosslinux <fosslinux@aussies.space>"
+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"
+skip_extraction="LICENSE"
+
+# ship your licenses, people
+post_extract() {
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE" .
+}
+
+post_install() {
+	vlicense LICENSE
+}

From ebfb80d0ea296e78f3c5579b01984abf232f73dd Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Sun, 4 Oct 2020 13:31:07 -0700
Subject: [PATCH 0313/3595] New package: signal-backup-decode-0.2.0

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

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
new file mode 100644
index 00000000000..3b5cfb2f526
--- /dev/null
+++ b/srcpkgs/signal-backup-decode/template
@@ -0,0 +1,13 @@
+# Template file for 'signal-backup-decode'
+pkgname=signal-backup-decode
+version=0.2.0
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel sqlite-devel"
+short_desc="Decode Signal Android Backups"
+maintainer="Spencer Burris <sburris@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/pajowu/signal-backup-decode"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9a454bb894963e7f6301bdcd3db2c7978fb0cfb7e6fce3f4f553ccad7f955fe9

From 7890657f76033d6032fba38d83644e297f1b9aa6 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Fri, 25 Sep 2020 15:41:32 -0300
Subject: [PATCH 0314/3595] New package: packr2-2.8.0

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

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
new file mode 100644
index 00000000000..15b01438d58
--- /dev/null
+++ b/srcpkgs/packr2/template
@@ -0,0 +1,18 @@
+# Template file for 'packr2'
+pkgname=packr2
+_pkgname=packr
+version=2.8.0
+revision=1
+wrksrc=${_pkgname}-${version}
+build_style=go
+go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+short_desc="Static files embedder for Go binaries"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="MIT"
+homepage="https://github.com/gobuffalo/packr"
+distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
+checksum=2cab1e8d60734af05d594346f8e4bffcef0ac2aea4895b08bd9f3c40fc24c639
+
+post_install() {
+	vlicense v2/LICENSE.txt
+}

From 1d2bef9282d35535df375f6a13ad354f9b0babf1 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 23 Sep 2020 15:07:53 -0300
Subject: [PATCH 0315/3595] New package: circleci-cli-0.1.9578

---
 srcpkgs/circleci-cli/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/circleci-cli/template

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
new file mode 100644
index 00000000000..0b4049bea15
--- /dev/null
+++ b/srcpkgs/circleci-cli/template
@@ -0,0 +1,29 @@
+# Template file for 'circleci-cli'
+pkgname=circleci-cli
+version=0.1.9578
+revision=1
+build_style=go
+go_import_path=github.com/CircleCI-Public/${pkgname}
+go_ldflags="-s -w -X github.com/CircleCI-Public/${pkgname}/version.Version=${version} -X github.com/CircleCI-Public/${pkgname}/version.Commit=cf6a918 -X github.com/CircleCI-Public/${pkgname}/version.packageManager=xbps"
+hostmakedepends="packr2"
+short_desc="Use CircleCI from the command line"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="MIT"
+homepage="https://circleci-public.github.io/circleci-cli/"
+distfiles="https://github.com/CircleCI-Public/${pkgname}/archive/v${version}.tar.gz"
+checksum=d5dac07d27d97ee41dced89cf2b36dfeea17906343b6a6a21c1d8c4ca34a78a0
+
+pre_build() {
+	packr2
+}
+
+post_build() {
+	packr2 clean
+}
+
+post_install() {
+	vlicense LICENSE
+
+	# Rename the binary according to CircleCI's own releases.
+	mv ${DESTDIR}/usr/bin/circleci{-cli,}
+}

From 2c01d6f21942a25fa32b541d00c2e44621cb494f Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 21 Oct 2020 17:25:50 +0200
Subject: [PATCH 0316/3595] apparmor: update to 3.0.0

---
 srcpkgs/apparmor/INSTALL.msg                  |  3 +-
 .../apparmor/files/profiles/usr.bin.dhcpcd    | 12 ++--
 srcpkgs/apparmor/files/profiles/usr.bin.nginx | 22 ++++---
 .../apparmor/files/profiles/usr.bin.php-fpm   | 17 +++---
 .../files/profiles/usr.bin.pulseaudio         | 35 +++++++----
 srcpkgs/apparmor/files/profiles/usr.bin.uuidd | 12 ++--
 .../files/profiles/usr.bin.wpa_supplicant     | 14 +++--
 .../patches/correct_paths_logprofconf.patch   | 60 ++++++++++++++-----
 srcpkgs/apparmor/patches/fix-musl.patch       | 24 ++++++++
 srcpkgs/apparmor/template                     | 50 ++++++++--------
 10 files changed, 160 insertions(+), 89 deletions(-)
 create mode 100644 srcpkgs/apparmor/patches/fix-musl.patch

diff --git a/srcpkgs/apparmor/INSTALL.msg b/srcpkgs/apparmor/INSTALL.msg
index c9f763715a6..488f2c40e11 100644
--- a/srcpkgs/apparmor/INSTALL.msg
+++ b/srcpkgs/apparmor/INSTALL.msg
@@ -1,2 +1 @@
-To ensure AppArmor is enabled upon reboot add 'apparmor=1 security=apparmor' to your grub CMDLINE and rebuild your grub config with 'grub-mkconfig -o /boot/grub/grub.cfg'.
-You'll also need to swith 'APPARMOR' setting in /etc/default/apparmor to your taste.
+To configure AppArmor properly, please refer to the Void Linux Handbook: https://docs.voidlinux.org/config/security/apparmor.html
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
index 26364f36385..1d6e1b95d62 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
@@ -1,10 +1,12 @@
 # vim:syntax=apparmor
 
-#include <tunables/global>
+abi <abi/3.0>,
+
+include <tunables/global>
 
 profile dhcpcd /{usr/,}bin/dhcpcd {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
+  include <abstractions/base>
+  include <abstractions/nameservice>
 
   capability chown,
   capability fowner,
@@ -16,8 +18,10 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
   capability setgid,
   capability sys_admin,
   capability sys_chroot,
+  capability bpf,
 
   network packet dgram,
+  network packet raw,
   network inet raw,
   network inet6 raw,
 
@@ -58,5 +62,5 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
   owner @{PROC}/@{pid}/stat r,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.dhcpcd>
+  include if exists <local/usr.bin.dhcpcd>
 }
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.nginx b/srcpkgs/apparmor/files/profiles/usr.bin.nginx
index 5e4854d9032..be769703f5d 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.nginx
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.nginx
@@ -1,25 +1,23 @@
 # vim:syntax=apparmor
 
+abi <abi/3.0>,
+
 # NOTE: This profile will by default work with pfp-fpm on TCP sockets.
 # If you need to make use of php-fpm unix socket, add the following to local/usr.bin.nginx
 # /path/to/your/unix/socket rw,
 
-#include <tunables/global>
+include <tunables/global>
 
-/usr/bin/nginx {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/nis>
-  #include <abstractions/openssl>
+profile nginx /usr/bin/nginx {
+  include <abstractions/base>
+  include <abstractions/nameservice>
+  include <abstractions/nis>
+  include <abstractions/openssl>
 
   capability setgid,
   capability setuid,
 
-  # XXX: Maybe switch to "/etc/nginx/** r," ?
-  /etc/nginx/*.conf r,
-  /etc/nginx/*_params r,
-  /etc/nginx/conf.d/* r,
-  /etc/nginx/mime.types r,
+  /etc/nginx/** r,
 
   /run/nginx.pid rw,
 
@@ -30,5 +28,5 @@
   /var/log/nginx/* w,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.nginx>
+  include if exists <local/usr.bin.nginx>
 }
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
index 98366dcaabf..0b036965da1 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm
@@ -1,22 +1,24 @@
 # vim:syntax=apparmor
 
+abi <abi/3.0>,
+
 # NOTE: This profile uses TCP sockets by default
 # If you wish for php-fpm to listen to unix socket,
 # add the following permission to local/usr.bin.php-fpm
 # /path/to/your/unix/socket w,
 
-#include <tunables/global>
+include <tunables/global>
 
 # This is PHP open_basedir where script can only be executed from.
 # /home, /tmp have been removed to not open permissions too widely
 # /usr/share/pear have been removed to have its own permission
 @{PHP_BASEDIRS} = /srv/www/ /var/www/ /usr/share/webapps/
 
-/usr/bin/php-fpm {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/openssl>
-  #include <abstractions/php>
+profile php-fpm /usr/bin/php-fpm {
+  include <abstractions/base>
+  include <abstractions/nameservice>
+  include <abstractions/openssl>
+  include <abstractions/php>
 
   capability setgid,
   capability setuid,
@@ -38,7 +40,6 @@
   /var/log/php-fpm.log w,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.php-fpm>
+  include if exists <local/usr.bin.php-fpm>
 
 }
-
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
index 4b17e6edc08..f8ceb4c2334 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio
@@ -1,12 +1,16 @@
-#include <tunables/global>
+# vim:syntax=apparmor
+
+abi <abi/3.0>,
+
+include <tunables/global>
 
 profile pulseaudio /usr/bin/pulseaudio {
-  #include <abstractions/base>
-  #include <abstractions/audio>
-  #include <abstractions/dbus-session>
-  #include <abstractions/dbus-strict>
-  #include <abstractions/nameservice>
-  #include <abstractions/X>
+  include <abstractions/base>
+  include <abstractions/audio>
+  include <abstractions/dbus-session>
+  include <abstractions/dbus-strict>
+  include <abstractions/nameservice>
+  include <abstractions/X>
 
   dbus send
        bus=system
@@ -67,12 +71,17 @@ profile pulseaudio /usr/bin/pulseaudio {
   /sys/devices/virtual/sound/**/uevent r,
 
   /usr/share/alsa/** r,
-  /usr/share/applications/ r,
-  /usr/share/applications/* r,
   /usr/share/pulseaudio/** r,
   /usr/lib/pulse-[1-9]*.[0-9]/modules/*.so mr,
   /usr/libexec/pulse/gsettings-helper Cx,
 
+  /usr/{,local/}share/applications/ r,
+  /usr/{,local/}share/applications/* r,
+  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/ r,
+  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/* r,
+  /var/lib/flatpak/exports/share/applications/ r,
+  /var/lib/flatpak/exports/share/applications/* r,
+
   owner /var/lib/gdm3/.config/pulse/ rw,
   owner /var/lib/gdm3/.config/pulse/* rw,
   owner /var/lib/gdm3/.config/pulse/cookie rwk,
@@ -106,9 +115,9 @@ profile pulseaudio /usr/bin/pulseaudio {
   owner /tmp/.esd-@{pid}*/socket rw,
 
   profile pulse-gsettings-helper /usr/libexec/pulse/gsettings-helper {
-    #include <abstractions/base>
-    #include <abstractions/gnome>
-    #include <abstractions/dconf>
+    include <abstractions/base>
+    include <abstractions/gnome>
+    include <abstractions/dconf>
 
     /usr/libexec/pulse/gsettings-helper mr,
     owner /{,var/}run/user/*/dconf/user rw,
@@ -118,6 +127,6 @@ profile pulseaudio /usr/bin/pulseaudio {
   }
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.pulseaudio>
+  include if exists <local/usr.bin.pulseaudio>
 }
 
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
index 8c00a903611..b365c927b65 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd
@@ -1,10 +1,12 @@
 # vim:syntax=apparmor
 
-#include <tunables/global>
+abi <abi/3.0>,
 
-/usr/bin/uuidd {
-  #include <abstractions/base>
-  #include <abstractions/consoles>
+include <tunables/global>
+
+profile uuid /usr/bin/uuidd {
+  include <abstractions/base>
+  include <abstractions/consoles>
 
   network inet dgram,
 
@@ -13,5 +15,5 @@
   /run/uuidd/request rw,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.uuidd>
+  include if exists <local/usr.bin.uuidd>
 }
diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
index df53acc82d6..c5bb67d562f 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant
@@ -1,8 +1,12 @@
-#include <tunables/global>
+# vim:syntax=apparmor
 
-/usr/bin/wpa_supplicant {
-  #include <abstractions/base>
-  #include <abstractions/dbus-strict>
+abi <abi/3.0>,
+
+include <tunables/global>
+
+profile wpa_supplicant /usr/bin/wpa_supplicant {
+  include <abstractions/base>
+  include <abstractions/dbus-strict>
 
   capability net_admin,
   capability net_raw,
@@ -45,5 +49,5 @@
        bus=system
        path=/fi/epitest/hostap/WPASupplicant/**,
 
-  #include <local/usr.bin.wpa_supplicant>
+  include if exists <local/usr.bin.wpa_supplicant>
 }
diff --git a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
index 0f25758486a..fb6ce53ffdc 100644
--- a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch
@@ -1,5 +1,14 @@
+From 6f2649203d6bfc26b79f624b5b4625603923bccd Mon Sep 17 00:00:00 2001
+From: Paper <paper@tilde.institute>
+Date: Wed, 21 Oct 2020 10:20:47 +0200
+Subject: [PATCH] correct paths in logprof.conf
+
+---
+ utils/logprof.conf | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
 diff --git a/utils/logprof.conf b/utils/logprof.conf
-index a3d7a31..296dd8b 100644
+index a778792..a9f7b79 100644
 --- a/utils/logprof.conf
 +++ b/utils/logprof.conf
 @@ -14,7 +14,7 @@
@@ -11,19 +20,42 @@ index a3d7a31..296dd8b 100644
    ldd = /usr/bin/ldd
    logger = /bin/logger /usr/bin/logger
  
-@@ -36,10 +36,10 @@
-   custom_includes =
- 
+@@ -51,12 +51,10 @@
+   /bin/mount    = u
+   /usr/bin/mount = u
+   /etc/init.d/subdomain = u
+-  /sbin/cardmgr = u
+-  /usr/sbin/cardmgr = u
+-  /sbin/subdomain_parser = u
+-  /usr/sbin/subdomain_parser = u
+-  /usr/sbin/genprof = u
+-  /usr/sbin/logprof = u
++  /usr/bin/cardmgr = u
++  /usr/bin/subdomain_parser = u
++  /usr/bin/genprof = u
++  /usr/bin/logprof = u
+   /usr/lib/YaST2/servers_non_y2/ag_genprof = u
+   /usr/lib/YaST2/servers_non_y2/ag_logprof = u
  
--[repository]
--  distro         = ubuntu-intrepid
--  url            = http://apparmor.test.opensuse.org/backend/api
--  preferred_user = ubuntu
-+#[repository]
-+#  distro         = ubuntu-intrepid
-+#  url            = http://apparmor.test.opensuse.org/backend/api
-+#  preferred_user = ubuntu
+@@ -97,8 +95,7 @@
+   /usr/bin/sed  = icn
+   /bin/touch    = icn
+   /usr/bin/touch = icn
+-  /sbin/killall5 = icn
+-  /usr/sbin/killall5 = icn
++  /usr/bin/killall5 = icn
+   /usr/bin/find = icn
+   /usr/bin/killall = icn
+   /usr/bin/nice = icn
+@@ -112,6 +109,8 @@
+   /usr/bin/python3.5    = icn
+   /usr/bin/python3.6    = icn
+   /usr/bin/python3.7    = icn
++  /usr/bin/python3.8    = icn
++  /usr/bin/python3.9    = icn
+   /usr/bin/tr   = icn
  
- [qualifiers]
-   # things will be painfully broken if bash has a profile
+ [required_hats]
+-- 
+2.29.0
 
diff --git a/srcpkgs/apparmor/patches/fix-musl.patch b/srcpkgs/apparmor/patches/fix-musl.patch
new file mode 100644
index 00000000000..484b67dfea4
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix-musl.patch
@@ -0,0 +1,24 @@
+diff --git a/binutils/aa_status.c b/binutils/aa_status.c
+index 78b0340..56ecac3 100644
+--- a/binutils/aa_status.c
++++ b/binutils/aa_status.c
+@@ -17,6 +17,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <dirent.h>
++#include <limits.h>
+ 
+ #include <sys/apparmor.h>
+ #include <sys/apparmor_private.h>
+diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
+index 32892d0..dad7664 100644
+--- a/libraries/libapparmor/include/sys/apparmor.h
++++ b/libraries/libapparmor/include/sys/apparmor.h
+@@ -22,6 +22,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index b064f78086e..4c260b24a1b 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=2.13.4
-revision=6
+version=3.0.0
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -16,23 +16,13 @@ maintainer="Olivier Mauras <olivier@mauras.ch>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=4f45e5a5de59b72039c6cf218bb61cb4fc42eeb7f47ca109a58238896394a33b
+checksum=8c440ab1848e723483a8550ed2889e18f322e9d7ee9eb4e2e712152ea61da68f
 patch_args="-Np1"
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="--with-perl --with-python"
 fi
 
-post_patch() {
-	# Make.rules feeds some system headers to the C preprocessor to produce
-	# lists of capability and address-family names that, respectively,
-	# populate 'parser/cap_names.h' and 'parser/af_names.h'. The escaping
-	# backslash in the '\#include" directives here is seen by the
-	# preprocessor, causing it to skip the system headers and produce empty
-	# files. Removing the backslash ensures correct behavior.
-	vsed -i ${wrksrc}/common/Make.rules -e 's/\\#include </#include </'
-}
-
 pre_configure() {
 	autoreconf -if
 }
@@ -40,14 +30,18 @@ pre_configure() {
 pre_build() {
 	# Replace release profiles with our own
 	cd ${wrksrc}
-
-	# Put in place our own profiles
 	cp ${FILESDIR}/profiles/* profiles/apparmor.d/
+
+	# use the correct syslog path
+	vsed -i utils/logprof.conf -e 's,logfiles = .*,logfiles = /var/log/socklog/kernel/current,'
 }
 
 post_build() {
 	cd ${wrksrc}
-	sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' parser/Makefile
+
+	# fix cross compilation
+	vsed -i parser/Makefile -e 's,cpp,$(CPP),'
+
 	make ${makejobs} -C binutils
 	make ${makejobs} -C utils
 	make ${makejobs} -C parser
@@ -56,27 +50,31 @@ post_build() {
 
 post_install() {
 	cd ${wrksrc}
-	make DESTDIR=${DESTDIR} install -C binutils
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install -C utils
-	make DESTDIR=${DESTDIR} APPARMOR_BIN_PREFIX=${DESTDIR}/usr/lib/apparmor \
-		SBINDIR=${DESTDIR}/usr/bin USR_SBINDIR=${DESTDIR}/usr/bin install -C parser
-	make DESTDIR=${DESTDIR} install -C profiles
-
-	# Put Vim syntax in the correct place
-	mkdir -p ${DESTDIR}/usr/share/vim/vim80/syntax/
-	mv ${DESTDIR}/usr/share/apparmor/apparmor.vim ${DESTDIR}/usr/share/vim/vim80/syntax/
+	commonflags="DESTDIR=\"${DESTDIR}\" SBINDIR=\"${DESTDIR}/usr/bin\" USR_SBINDIR=\"${DESTDIR}/usr/bin\""
+	make $commonflags install -C binutils
+	make $commonflags \
+		BINDIR="${DESTDIR}/usr/bin" \
+		VIM_INSTALL_PATH="${DESTDIR}/usr/share/vim/vimfiles/syntax" \
+		install -C utils
+	make $commonflags \
+		APPARMOR_BIN_PREFIX="${DESTDIR}/usr/lib/apparmor" \
+		install -C parser
+	make DESTDIR="${DESTDIR}" install -C profiles
 
 	# requires perl bindings not generated when cross-compiling
 	if [ "$CROSS_BUILD" ]; then
 		rm -f ${DESTDIR}/usr/bin/aa-notify
 	fi
+
+	# we installed a custom conflicting profile
+	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
 }
 
 apparmor-vim_package() {
 	short_desc+=" - Vim syntax"
 	depends="vim"
 	pkg_install() {
-		vmove usr/share/vim/vim80/syntax/apparmor.vim
+		vmove usr/share/vim/vimfiles/syntax/apparmor.vim
 		vmove usr/share/man/man5/apparmor.vim.5
 	}
 }

From 07d32cc2e3d0996656cf2bd35281c7b9b8d4e846 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 19:13:44 -0600
Subject: [PATCH 0317/3595] aqemu: update to 0.9.4

---
 srcpkgs/aqemu/patches/memory-leak.patch | 68 -------------------------
 srcpkgs/aqemu/patches/stdexcept.patch   | 27 +++++++---
 srcpkgs/aqemu/template                  |  8 +--
 3 files changed, 25 insertions(+), 78 deletions(-)
 delete mode 100644 srcpkgs/aqemu/patches/memory-leak.patch

diff --git a/srcpkgs/aqemu/patches/memory-leak.patch b/srcpkgs/aqemu/patches/memory-leak.patch
deleted file mode 100644
index d2369e18687..00000000000
--- a/srcpkgs/aqemu/patches/memory-leak.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c031cf9ba4023b2026e5680ddcd0daeca5e6b842 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tobias=20Gl=C3=A4=C3=9Fer?= <tobimensch@yahoo.de>
-Date: Tue, 14 Jun 2016 20:25:24 +0200
-Subject: [PATCH] Small memory leak fixes.
-
----
- src/HDD_Image_Info.cpp    | 5 +++++
- src/HDD_Image_Info.h      | 1 +
- src/Properties_Window.cpp | 5 +++++
- src/Properties_Window.h   | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git src/HDD_Image_Info.cpp src/HDD_Image_Info.cpp
-index 4cd34b4..9d29c88 100644
---- src/HDD_Image_Info.cpp
-+++ src/HDD_Image_Info.cpp
-@@ -32,6 +32,11 @@ HDD_Image_Info::HDD_Image_Info( QObject *parent )
- 	QEMU_IMG_Proc = new QProcess( this );
- }
- 
-+HDD_Image_Info::~HDD_Image_Info()
-+{
-+    delete QEMU_IMG_Proc;
-+}
-+
- VM::Disk_Info HDD_Image_Info::Get_Disk_Info() const
- {
- 	return Info;
-diff --git src/HDD_Image_Info.h src/HDD_Image_Info.h
-index 2cfec47..9339464 100644
---- src/HDD_Image_Info.h
-+++ src/HDD_Image_Info.h
-@@ -32,6 +32,7 @@ class HDD_Image_Info : public QObject
- 	
- 	public:
- 		HDD_Image_Info( QObject *parent = 0 );
-+        ~HDD_Image_Info();
- 		VM::Disk_Info Get_Disk_Info() const;
- 		
- 	public slots:
-diff --git src/Properties_Window.cpp src/Properties_Window.cpp
-index 918251f..48d9619 100644
---- src/Properties_Window.cpp
-+++ src/Properties_Window.cpp
-@@ -47,6 +47,11 @@ Properties_Window::Properties_Window( QWidget *parent )
- 			 this, SLOT(on_Button_Update_Info_clicked()) );
- }
- 
-+Properties_Window::~Properties_Window()
-+{
-+    delete HDD_Info;
-+}
-+
- const VM_Storage_Device &Properties_Window::Get_Floppy()
- {
- 	PW_Storage.Set_Enabled( true );
-diff --git src/Properties_Window.h src/Properties_Window.h
-index 75ecbc1..bb9f692 100644
---- src/Properties_Window.h
-+++ src/Properties_Window.h
-@@ -33,6 +33,7 @@ class Properties_Window: public QDialog
- 
- 	public:
- 		Properties_Window( QWidget *parent = 0 );
-+        ~Properties_Window();
- 		
- 		const VM_Storage_Device &Get_Floppy();
- 		const VM_Storage_Device &Get_CD_ROM();
diff --git a/srcpkgs/aqemu/patches/stdexcept.patch b/srcpkgs/aqemu/patches/stdexcept.patch
index 8b2b015e239..70c87ccd073 100644
--- a/srcpkgs/aqemu/patches/stdexcept.patch
+++ b/srcpkgs/aqemu/patches/stdexcept.patch
@@ -1,10 +1,25 @@
---- src/docopt/docopt_value.h	2016-05-31 14:34:02.000000000 +0200
-+++ src/docopt/docopt_value.h	2020-09-24 20:10:27.152286526 +0200
-@@ -13,6 +13,7 @@
- #include <vector>
- #include <functional> // std::hash
+From fe1fd5c856a79d9f0704ad2b973caf786272dbd4 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sat, 21 Nov 2020 19:08:35 -0600
+Subject: [PATCH] stdexcept
+
+---
+ src/docopt/docopt_value.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/docopt/docopt_value.h src/docopt/docopt_value.h
+index ddb8a8e..99aa545 100644
+--- src/docopt/docopt_value.h
++++ src/docopt/docopt_value.h
+@@ -13,7 +13,7 @@
  #include <iosfwd>
+ #include <string>
+ #include <vector>
+-
 +#include <stdexcept>
- 
  namespace docopt {
  
+ /// A generic type to hold the various types that can be produced by docopt.
+-- 
+2.29.2
+
diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template
index a3dcfe64e57..eea61aa562b 100644
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@@ -1,7 +1,7 @@
 # Template file for 'aqemu'
 pkgname=aqemu
-version=0.9.2
-revision=2
+version=0.9.4
+revision=1
 build_style=cmake
 configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
 makedepends="qt5-devel qemu desktop-file-utils"
@@ -10,8 +10,8 @@ short_desc="GUI to QEMU and KVM emulators, written in Qt4"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://aqemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/aqemu/${version}/aqemu-$version.tar.gz"
-checksum=e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de
+distfiles="https://github.com/TBK/aqemu/archive/v${version}.tar.gz"
+checksum=576ae78de936518a1de057355ffc192b59e42be934f0111122b2c5fcafe318a7
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From abe7eff34177caff47206eb5d644b3955bcfddb0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 19:47:19 -0600
Subject: [PATCH 0318/3595] apache-fop: update to 2.5

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

diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index ab39b281da2..d8b6808a93e 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -1,7 +1,7 @@
 # Template file for 'apache-fop'
 pkgname=apache-fop
-version=2.4
-revision=2
+version=2.5
+revision=1
 wrksrc="fop-${version}"
 build_wrksrc="fop"
 hostmakedepends="openjdk8 apache-ant"
@@ -12,8 +12,8 @@ license="Apache-2.0"
 homepage="http://xmlgraphics.apache.org/fop/"
 distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz
  http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
-checksum="1d6b323b1c4968a492a234ba1b726e78c96b91cfd871f77cb579d68729443086
- d97f7318ca1aab9937d68aa6ce2a00379d8d4a0b692515246c84d328a6bf4f0c"
+checksum="783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005
+ 6a3c5f8915be5ef90fff202c818152d8252bb45b96d9c5d6550594903739e5ed"
 conf_files="/etc/fop.conf"
 
 do_build() {

From 319a2b3138a45971c9efd71770181edfc4d9c17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 22 Nov 2020 05:55:39 +0100
Subject: [PATCH 0319/3595] libgcrypt: fix cross

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

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 4c8f5c5cc26..650f022ad7a 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -12,9 +12,9 @@ homepage="https://www.gnupg.org"
 distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
 checksum=03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc|ppc-musl) configure_args+=" ac_cv_sys_symbol_underscore=no" ;;
-esac
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" ac_cv_sys_symbol_underscore=no"
+fi
 
 post_configure() {
 	case "$XBPS_TARGET_MACHINE" in

From 7557d67631b86586bb6c087b915cdb0f51c766fd Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 21 Nov 2020 09:48:35 -0800
Subject: [PATCH 0320/3595] GoLand: update to 2020.2.3.

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

diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index e0bb8b2bade..18ed226159d 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
 # Template file for 'GoLand'
 pkgname=GoLand
-version=2020.1
+version=2020.2.3
 revision=1
 archs="i686 x86_64"
 depends="jetbrains-jdk-bin"
@@ -9,10 +9,11 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/go"
 distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=c63de783facbf8d96eb6714240218c3c320fdbda1ddaa965f7fe72ecf6e897e2
+checksum=c0ca83c05e156c58483b42eb9a14fd1013434c8936fbba20ffd4b0b722a6bfa2
 repository=nonfree
 restricted=yes
 nopie=yes
+python_version=3
 
 post_extract() {
 	# Remove files for other CPU architectures

From f546f00705b99b705ce9c0d589419464fc915e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 0321/3595] New package: ZMusic-1.1.3.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                         |  2 ++
 srcpkgs/ZMusic-devel                  |  1 +
 srcpkgs/ZMusic/patches/ppc-musl.patch | 13 ++++++++++
 srcpkgs/ZMusic/template               | 35 +++++++++++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/ppc-musl.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index 9347a28eb41..eb67144d1a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2975,6 +2975,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch
new file mode 100644
index 00000000000..729b73b155d
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/ppc-musl.patch
@@ -0,0 +1,13 @@
+Taken from libgme package.
+
+--- thirdparty/game-music-emu/gme/blargg_endian.h
++++ thirdparty/game-music-emu/gme/blargg_endian.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+-	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
++	defined (__sparc__)     || \
+ 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+ 	#define BLARGG_BIG_ENDIAN 1
+ #elif !defined (__mips__)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..b75b6d0c409
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/coelckers/ZMusic"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From a3ffb9697975db6132a7d7840bd20353946eb76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 0322/3595] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/fix-i686.patch         | 32 +++++++++++++++++
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 35 ++++++++++---------
 5 files changed, 51 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 create mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
new file mode 100644
index 00000000000..b66d70db512
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 26c617e..e162638 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -1361,11 +1361,11 @@ endif()
+ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+ 	# Need to enable intrinsics for these files.
+ 	if( SSE_MATTERS )
+-		set_property( SOURCE
++		set_source_files_properties(
+ 			common/rendering/polyrenderer/poly_all.cpp
+ 			rendering/swrenderer/r_all.cpp
+-			utility/palette.cpp
+-			utility/x86.cpp
++			common/utility/palette.cpp
++			common/utility/x86.cpp
+ 			APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
+ 	endif()
+ endif()
+diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
+index f2a2987..b8de208 100644
+--- src/common/utility/palette.cpp
++++ src/common/utility/palette.cpp
+@@ -33,6 +33,8 @@
+ */
+ 
+ #include <algorithm>
++#include <cfloat>
++#include <cmath>
+ #include "palutil.h"
+ #include "palentry.h"
+ #include "sc_man.h"
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..bc644c1e3f2 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,44 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-3.0-or-later"
 homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz
  https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_amd64.deb"
-checksum="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
 esac
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
+	vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
+	vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp
+	vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
+		-i src/common/platform/posix/i_system.h
+	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
 }
 
 post_install() {

From f1a3e0e4d836d333641d116a2a16ee4711327af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 22 Jul 2020 16:36:59 -0300
Subject: [PATCH 0323/3595] Manual.md: revamp explain_depends section.

Add useful examples of checkdepends that might not be obvious.
---
 Manual.md | 69 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/Manual.md b/Manual.md
index c520d06c133..7647f957129 100644
--- a/Manual.md
+++ b/Manual.md
@@ -727,36 +727,45 @@ Examples:
 Do not use noarch. It is deprecated and being removed.
 
 <a id="explain_depends"></a>
-#### About the many types of `depends` variable.
-
-So far we have listed four types of `depends`, there are `hostmakedepends`,
-`makedepends`, `checkdepends` and plain old `depends`.To understand the difference
-between them, understand this: Void Linux cross compiles for many arches.
-Sometimes in a build process, certain programs must be run, for example `yacc`, or the
-compiler itself for a C program. Those programs get put in `hostmakedepends`.
-When the build runs, those will be installed on the host to help the build
-complete.
-
-Then there are those things for which a package either links against or
-includes header files. These are `makedepends`, and regardless of the
-architecture of the build machine, the architecture of the target machine must
-be used. Typically the `makedepends` will be the only one of the three types of
-`depends` to include `-devel` packages, and typically only `-devel` packages.
-
-Then there are those things that are required for a package to run its testsuite
-`dejagnu` or libraries it must link to when building test binaries like `cmocka`.
-These are `checkdepends` and they are installed like they are part of `makedepends`.
-the difference is that they are only installed when `XBPS_CHECK_PKGS` is defined.
-
-The final variable, `depends`, is for those things the package needs at
-runtime and without which is unusable, and that xbps can't auto-detect.
-These are not all the packages the package needs at runtime, but only those
-that are not linked against. This variable is most useful for non-compiled
-programs.
-
-Finally, as a general rule, if something compiles the exact same way whether or
-not you add a particular package to `makedepends` or `hostmakedepends`, it
-shouldn't be added.
+#### About the many types of `depends` variables
+
+So far, we have listed four types of `depends` variables: `hostmakedepends`,
+`makedepends`, `checkdepends` and `depends`. These different kinds of variables
+are necessary because `xbps-src` supports cross compilation and to avoid
+installing unecessary packages in the build environment.
+
+During a build process, there are programs that must be _run_ on the host, such
+as `yacc` or the C compiler. The packages that contain these programs should be
+listed in `hostmakedepends`, and will be installed on the host when building the
+target package. Some of these packages are dependencies of the `base-chroot`
+package and don't need to be listed. It is possible that some of the programs
+necessary to build a project are located in `-devel` packages.
+
+The target package can also depend on other packages for libraries to link
+against or header files. These packages should be listed in `makedepends` and
+will match the target architecture, regardless of the architecture of the build
+machine. Typically, `makedepends` will contain mainly `-devel` packages.
+
+Furthermore, if `XBPS_CHECK_PKGS` is set or the `-Q` option is passed to
+`xbps-src`, the target package might require specific dependencies or libraries
+that are linked into its test binaries to run its test suite. These dependencies
+should be listed in `checkdepends` and will be installed as if they were part of
+`hostmakedepends`. Some dependencies that can be included in `checkdepends` are:
+
+- `dejagnu`: used for some GNU projects
+- `cmocka-devel`: linked into test binaries
+- `dbus`: makes it possible to run `dbus-run-session <test-command>` to provide
+  a D-Bus session for applications that need it
+- `git`: some test suites run the `git` command
+
+Lastly, a package may require certain dependencies at runtime, without which it
+is unusable. These dependencies, when they aren't detected automatically by
+XBPS, should be listed in `depends`. This is mostly relevant for Perl and Python
+modules and other programs that use `dlopen(3)` instead of dynamically linking.
+
+Finally, as a general rule, if a package is built the exact same way whether or
+not a particular package is present in `makedepends` or `hostmakedepends`, that
+package shouldn't be added as a build time dependency.
 
 <a id="repositories"></a>
 #### Repositories

From 7ec2b0c613d7b942aa4487b70dc8f5c9b3cb3628 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <agausmann@fastmail.com>
Date: Fri, 17 Apr 2020 22:42:41 -0500
Subject: [PATCH 0324/3595] New package: rpi-imager-1.4

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

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
new file mode 100644
index 00000000000..799d3803c03
--- /dev/null
+++ b/srcpkgs/rpi-imager/template
@@ -0,0 +1,14 @@
+# Template file for 'rpi-imager'
+pkgname=rpi-imager
+version=1.4
+revision=1
+build_style=cmake
+hostmakedepends="qt5-devel"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+depends="qt5-quickcontrols2 qt5-svg util-linux"
+short_desc="Raspberry Pi Imaging Utility"
+maintainer="Adam Gausmann <agausmann@fastmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/raspberrypi/rpi-imager"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"

From 2a1c4a1dc61c200025a97d43eee78999038d4172 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 21 Apr 2020 08:29:19 +0200
Subject: [PATCH 0325/3595] New package: parprouted-0.7

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

diff --git a/srcpkgs/parprouted/template b/srcpkgs/parprouted/template
new file mode 100644
index 00000000000..34289661036
--- /dev/null
+++ b/srcpkgs/parprouted/template
@@ -0,0 +1,16 @@
+# Template file for 'parprouted'
+pkgname=parprouted
+version=0.7
+revision=1
+build_style=gnu-makefile
+short_desc="Proxy ARP IP bridging daemon"
+maintainer="Pulux <pulux@pf4sh.de>"
+license="GPL-2.0-or-later"
+homepage="http://www.hazard.maks.net/parprouted/"
+distfiles="http://www.hazard.maks.net/parprouted/${pkgname}-${version}.tar.gz"
+checksum=d63643c95d4149a3d71112da5892f459433456bf0279bfa304625f109178defc
+
+do_install() {
+	vbin parprouted
+	vman parprouted.8
+}

From cc16a8a1edd79843b79673e13c9bed65c6fbc3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 13:05:15 +0700
Subject: [PATCH 0326/3595] rpi-imager: fix ftbfs

Closes: #26597 [via git-merge-pr]
---
 srcpkgs/rpi-imager/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 799d3803c03..f50227c753a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -3,8 +3,9 @@ pkgname=rpi-imager
 version=1.4
 revision=1
 build_style=cmake
-hostmakedepends="qt5-devel"
-makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel libcurl-devel libarchive-devel util-linux"
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
+ libcurl-devel libarchive-devel"
 depends="qt5-quickcontrols2 qt5-svg util-linux"
 short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
@@ -12,3 +13,11 @@ license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
 distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
 checksum="f42359fca67a61fa37f0dfd0167749b7d758263b8501c07473d416542d78e004"
+
+post_patch() {
+	vsed -i -e 's/CURL REQUIRED \([0-9.]*\)/CURL \1 REQUIRED/' CMakeLists.txt
+}
+
+pre_configure() {
+	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
+}

From 14891da39d65658c050aeb72799cb4e2231b545a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:06:34 -0400
Subject: [PATCH 0327/3595] New package: libnma-1.8.30

---
 common/shlibs           |  1 +
 srcpkgs/libnma-devel    |  1 +
 srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/libnma-devel
 create mode 100644 srcpkgs/libnma/template

diff --git a/common/shlibs b/common/shlibs
index eb67144d1a1..b1833bf6de8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,6 +2984,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnm-gtk-1.4.0_1
+libnma.so.0 libnma-1.8.30_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel
new file mode 120000
index 00000000000..21c1b5b0b03
--- /dev/null
+++ b/srcpkgs/libnma-devel
@@ -0,0 +1 @@
+libnma
\ No newline at end of file
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
new file mode 100644
index 00000000000..c6c0aba1901
--- /dev/null
+++ b/srcpkgs/libnma/template
@@ -0,0 +1,41 @@
+# Template file for 'libnma'
+pkgname=libnma
+version=1.8.30
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
+makedepends="gcr-devel gtk+3-devel iso-codes
+ mobile-broadband-provider-info NetworkManager-devel"
+depends="NetworkManager iso-codes"
+short_desc="NetworkManager panel applet for GNOME - runtime library"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libnma"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+="-Dgtk_doc=false"
+	hostmakedepends+=" libnma-devel"
+fi
+
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vmkdir usr/share/gtk-doc/html 0755
+		vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html
+	fi
+}
+
+libnma-devel_package() {
+	short_desc+=" - library development files"
+	depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}

From ee928ee031feac8b9519b164d93ece6a2cfffa95 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:09:38 -0400
Subject: [PATCH 0328/3595] network-manager-applet: update to 1.18.0

---
 common/shlibs                           |  1 -
 srcpkgs/libnm-gtk                       |  1 -
 srcpkgs/network-manager-applet-devel    |  1 -
 srcpkgs/network-manager-applet/template | 47 ++++---------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 120000 srcpkgs/libnm-gtk
 delete mode 120000 srcpkgs/network-manager-applet-devel

diff --git a/common/shlibs b/common/shlibs
index b1833bf6de8..d97a1f8ff85 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.2 libcolord-1.1.7_1
 libcolordprivate.so.2 libcolord-1.1.7_1
 libcolorhug.so.2 libcolord-1.1.7_1
-libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
 libgrilo-0.3.so.0 grilo-0.3.2_1
diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/libnm-gtk
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
deleted file mode 120000
index f95007eeb04..00000000000
--- a/srcpkgs/network-manager-applet-devel
+++ /dev/null
@@ -1 +0,0 @@
-network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 0656107b1af..2d9861a94ba 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,14 +1,14 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.24
+version=1.18.0
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
- libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
- polkit-devel mobile-broadband-provider-info"
+ libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel
+ libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel
+ libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,38 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf
+checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
 lib32disabled=yes
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_build() {
-	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs"
-}
-
-libnm-gtk_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-network-manager-applet-devel_package() {
-	depends="gtk+3-devel NetworkManager-devel>=1.0
-	 libnm-gtk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}

From 332087996d536d9e4fe79838d20a2fff8ab7c5c7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 09:34:07 -0400
Subject: [PATCH 0329/3595] NetworkManager-strongswan: update to 1.5.2

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

diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template
index 4d8d2b14306..46c02d092e5 100644
--- a/srcpkgs/NetworkManager-strongswan/template
+++ b/srcpkgs/NetworkManager-strongswan/template
@@ -1,16 +1,16 @@
 # Template file for 'NetworkManager-strongswan'
 pkgname=NetworkManager-strongswan
-version=1.4.5
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-more-warnings --without-libnm-glib
  --disable-more-warnings"
 hostmakedepends="intltool pkg-config"
-makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel"
 depends="strongswan"
 short_desc="Strongswan NetworkManager plugin"
 maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2"
-checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04
+checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169

From a1957c8ef62569ce302dae1d7faff4e237ea7f05 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 10:05:40 -0400
Subject: [PATCH 0330/3595] NetworkManager-l2tp: change dependency to
 libnma-devel

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index d60f5878792..1dea408c423 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel
- network-manager-applet-devel libressl-devel nss-devel ppp-devel"
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+ libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"
 maintainer="Douglas Kosovic <doug@uq.edu.au>"

From 005a9c7fb7a57e4e9bc6eb227bc01b3cea3da5f2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 11:20:26 -0400
Subject: [PATCH 0331/3595] NetworkManager-openconnect: change dependency to
 libnma-devel

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

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index 327f2bd84cb..f32a075180f 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,18 +1,17 @@
-# Template build file for 'NetworkManager-openconnect'.
+# Template file for 'NetworkManager-openconnect'
 pkgname=NetworkManager-openconnect
 version=1.2.6
-revision=2
-lib32disabled=yes
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel
- libxml2-devel openconnect-devel libressl-devel liblz4-devel
- gcr-devel"
+makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
+ libressl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-license="GPL-2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
 checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+lib32disabled=yes

From 219380af9dc569c260cd7d3a73d62782ef9c3306 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 12:33:51 -0400
Subject: [PATCH 0332/3595] NetworkManager-openvpn: update to 1.8.12

---
 ...isable-libnm-glib-support-by-default.patch | 52 -------------------
 srcpkgs/NetworkManager-openvpn/template       |  8 +--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch

diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
deleted file mode 100644
index 7eb72e1dbb6..00000000000
--- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn
-
-From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
-Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com>
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 17 Oct 2018 15:21:30 +0200
-Subject: [PATCH] build: disable libnm-glib support by default
-
-By now nobody should be using this. Keep the code around for a little
-longer just in case anybody still uses this.
-
-The libnm-glib support also serves as an example how do we build two
-different versions of the properties plugin. We'll soon be in a similar
-situation with Gtk 4.0. (sigh.) Just don't drop it yet.
-
-Conflicts:
-	NEWS
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11ff5d0..eaf015b 100644
---- configure.ac
-+++ configure.ac
-@@ -75,20 +75,20 @@ dnl
- dnl GNOME support
- dnl
- AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
--AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
-+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
- if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
- 	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
- 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
- 	fi
- fi
- if test "$with_gnome" != no; then
- 	with_gnome=yes
- fi
- if test "$with_libnm_glib_specified" == no; then
--	with_libnm_glib="$with_gnome"
-+	with_libnm_glib=no
- fi
--if test "$with_libnm_glib" != no; then
--	with_libnm_glib=yes
-+if test "$with_libnm_glib" != yes; then
-+	with_libnm_glib=no
- fi
- AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
- AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
--- 
-2.20.1
diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 170d992326e..7f2c40e6de3 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.10
-revision=2
+version=1.8.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef
+checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From 9f5c86e1c56475de7cda1ebe18fdd4ea475727d1 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 18:18:52 -0400
Subject: [PATCH 0333/3595] NetworkManager-pptp: change dependency to
 libnma-devel

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

diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 7889bb47800..9c541cf246f 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,12 +1,12 @@
 # Template file for 'NetworkManager-pptp'
 pkgname=NetworkManager-pptp
 version=1.2.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-libnm-glib"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel
- network-manager-applet-devel NetworkManager-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+ NetworkManager-devel ppp-devel"
 depends="pptpclient"
 short_desc="NetworkManager VPN plugin for pptp"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 5d2c20263e1414158cb159814dab19f4f19a9ce4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 20:09:35 -0400
Subject: [PATCH 0334/3595] gnome-control-center: update to 3.38.1

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 191101afaad..b4be62deaa3 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
  libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
- libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel
+ libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da
+checksum=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026
 
 build_options="cheese"
 build_options_default="cheese"

From 0784d4f3b2f18b119f9dc13e06749a34dbc59c86 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 21:03:32 -0400
Subject: [PATCH 0335/3595] gnome-initial-setup: update to 3.38.1

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 63abd3c5c83..12886a0f9ae 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
- mit-krb5-devel vala-devel network-manager-applet-devel polkit-devel
+ mit-krb5-devel vala-devel libnma-devel polkit-devel
  rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
  pango-devel"
 depends="iso-codes"
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3a857aef5efb689f408632db8469ad27620f762d977070a36035c522c6f82759
+checksum=e55d4f4073998e0fb7b3dfcc470e2a4c7d950a96bedab15011b9084ebc813676

From cfe928c8c1eeba67b3f84f74cbbf687a68f63756 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 6 Oct 2020 22:29:32 -0400
Subject: [PATCH 0336/3595] gnome-shell: update to 3.38.1

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index bc4cd67fae7..6753b6ac54e 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
- network-manager-applet-devel polkit-devel pulseaudio-devel
+ libnma-devel polkit-devel pulseaudio-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"

From 1b7b35b15eb229131da0158c5861cde886f8c50b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 7 Oct 2020 01:24:58 -0400
Subject: [PATCH 0337/3595] cinnamon-control-center: change dependency to
 libnma-devel

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

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 27f0fbeb748..b9ebe5f22d1 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
 version=4.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -10,7 +10,7 @@ hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel
- libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel
+ libnotify-devel libwacom-devel libnma-devel polkit-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"

From 55356b78a9f4cbc33c5eea9d7477ba0f2926f735 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 8 Oct 2020 19:45:42 -0400
Subject: [PATCH 0338/3595] switchboard-plug-network: update to 2.3.2

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

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index d7e5cac19d3..d243f041ed4 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,14 +1,15 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.1.4
+version=2.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala"
 makedepends="switchboard-devel granite-devel gtk+3-devel
- network-manager-applet-devel NetworkManager-devel"
+ libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
+homepage="https://github.com/elementary/switchboard-plug-network"
+distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
+checksum=61c3803dccf68324afe7cb67094fd9dbcb874cae47284b9b131b9bd49971d9b8
+nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"

From 236ebebc24ec7ca27e4fdfd668d3692824a5c6a6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 12 Oct 2020 20:52:23 -0400
Subject: [PATCH 0339/3595] NetworkManager-vpnc: change dependency to
 libnma-devel

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

diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template
index a8b8ce12176..b9d17226132 100644
--- a/srcpkgs/NetworkManager-vpnc/template
+++ b/srcpkgs/NetworkManager-vpnc/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-vpnc'
 pkgname=NetworkManager-vpnc
 version=1.2.6
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--localstatedir=/var --disable-static --without-libnm-glib"
 hostmakedepends="pkg-config intltool"
-makedepends="libnm libnm-gtk network-manager-applet-devel libsecret-devel"
+makedepends="gtk+3-devel libnm libnma-devel libsecret-devel"
 depends="vpnc"
 short_desc="NetworkManager VPN plugin for VPNC"
 maintainer="Peter Kuchar <masaj@gmx.com>"

From 4da50e8c991cdd17f5d24aafc57ac8677a1234db Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 21 Nov 2020 23:07:30 -0800
Subject: [PATCH 0340/3595] growlight: make zfs optional

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 65e5f69d52a..5ea4a3a42a8 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,12 +1,13 @@
 # Template file for 'growlight'
 pkgname=growlight
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
+configure_args="$(vopt_bool zfs USE_LIBZFS)"
 hostmakedepends="pkg-config pandoc"
 makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
  nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
- device-mapper-devel pciutils-devel zfs-devel"
+ device-mapper-devel pciutils-devel $(vopt_if zfs zfs-devel)"
 depends="ntfs-3g jfsutils xfsprogs nvme-cli hdparm f2fs-tools btrfs-progs e2fsprogs"
 short_desc="Block device manager and system installation tool"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,3 +15,6 @@ 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=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
+
+build_options="zfs"
+desc_option_zfs="Build with ZFS Support"

From 7374d99625835a1f41b79de6c107b0f7f2c7285f Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Thu, 29 Oct 2020 10:01:31 +1100
Subject: [PATCH 0341/3595] openvpn: update to 2.5.0

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

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 63a8ce1b77e..f6ebdbb57d6 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,20 +1,19 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.4.9
-revision=3
+version=2.5.0
+revision=1
 build_style=gnu-configure
-configure_args="$(vopt_enable pkcs11) --enable-iproute2 --disable-systemd
+configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
-hostmakedepends="iproute2 pkg-config"
+hostmakedepends="pkg-config"
 makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
-depends="iproute2"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=641f3add8694b2ccc39fd4fd92554e4f089ad16a8db6d2b473ec284839a5ebe2
+checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
 build_options_default="mbedtls"

From 2ba0cff64ba64f0b1f2d162699211d4e6b57230b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:20:05 +0100
Subject: [PATCH 0342/3595] erlang: update to 23.1.4.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 6fb84cb0a8b..6557281ec4c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.1.3
+version=23.1.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=291e0852b71ca593f4015417f6e44c08638633c5af6648bd26582c8590390433
+checksum=8f6718b82bbca72d7dfe0b0de10b6e043cefe9e5ac08d3f84e18f8522d794967
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -59,7 +59,6 @@ post_install() {
 erlang-doc_package() {
 	short_desc="Erlang programming language documentation and examples"
 	depends="${sourcepkg}-${version}_${revision}"
-	archs=noarch
 	pkg_install() {
 		vmove usr/lib/erlang/doc
 		for i in $(cd ${DESTDIR}; find usr/lib/erlang -type d \( -path '*/examples' -o -path '*/doc/html' \))

From d4f7e2f5c7d7ad1dc46868cdaf52954c583eb10f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:22:52 +0100
Subject: [PATCH 0343/3595] include-what-you-use: update to 0.15.

---
 ...de-what-you-use-001-llvm11-stringref.patch | 146 ------------------
 ...ude-what-you-use-002-clang-astdumper.patch |  54 -------
 srcpkgs/include-what-you-use/template         |  14 +-
 3 files changed, 4 insertions(+), 210 deletions(-)
 delete mode 100644 srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
 delete mode 100644 srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch

diff --git a/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch b/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
deleted file mode 100644
index 171dca28e34..00000000000
--- a/srcpkgs/include-what-you-use/files/include-what-you-use-001-llvm11-stringref.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 53487d209729d5781007dc0fd6076dc585cb3727 Mon Sep 17 00:00:00 2001
-From: Andrea Bocci <andrea.bocci@cern.ch>
-Date: Fri, 28 Feb 2020 17:45:03 +0100
-Subject: [PATCH] Add explicit conversion from llvm::StringRef to std::string
-
-llvm/llvm-project@777180a makes the llvm::StringRef conversion operator
-to std::string explicit.
-These changes add a call to the str() method to perform the conversion.
-
-Signed-off-by: Andrea Bocci <andrea.bocci@cern.ch>
----
- iwyu_driver.cc       | 2 +-
- iwyu_globals.cc      | 4 ++--
- iwyu_lexer_utils.cc  | 2 +-
- iwyu_location_util.h | 2 +-
- iwyu_output.cc       | 2 +-
- iwyu_path_util.cc    | 6 +++---
- iwyu_preprocessor.cc | 4 ++--
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/iwyu_driver.cc b/iwyu_driver.cc
-index bd163144..42fea35b 100644
---- a/iwyu_driver.cc
-+++ b/iwyu_driver.cc
-@@ -79,7 +79,7 @@ std::string GetExecutablePath(const char *Argv0) {
- }
- 
- const char *SaveStringInSet(std::set<std::string> &SavedStrings, StringRef S) {
--  return SavedStrings.insert(S).first->c_str();
-+  return SavedStrings.insert(S.str()).first->c_str();
- }
- 
- void ExpandArgsFromBuf(const char *Arg,
-diff --git a/iwyu_globals.cc b/iwyu_globals.cc
-index 0f58b4dc..26998966 100644
---- a/iwyu_globals.cc
-+++ b/iwyu_globals.cc
-@@ -293,7 +293,7 @@ static vector<HeaderSearchPath> ComputeHeaderSearchPaths(
-   for (auto it = header_search->system_dir_begin();
-        it != header_search->system_dir_end(); ++it) {
-     if (const DirectoryEntry* entry = it->getDir()) {
--      const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName()));
-+      const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName().str()));
-       search_path_map[path] = HeaderSearchPath::kSystemPath;
-     }
-   }
-@@ -303,7 +303,7 @@ static vector<HeaderSearchPath> ComputeHeaderSearchPaths(
-       // search_dir_begin()/end() includes both system and user paths.
-       // If it's a system path, it's already in the map, so everything
-       // new is a user path.  The insert only 'takes' for new entries.
--      const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName()));
-+      const string path = NormalizeDirPath(MakeAbsolutePath(entry->getName().str()));
-       search_path_map.insert(make_pair(path, HeaderSearchPath::kUserPath));
-     }
-   }
-diff --git a/iwyu_lexer_utils.cc b/iwyu_lexer_utils.cc
-index fcea2d28..648c9da8 100644
---- a/iwyu_lexer_utils.cc
-+++ b/iwyu_lexer_utils.cc
-@@ -70,7 +70,7 @@ SourceLocation GetLocationAfter(
- string GetIncludeNameAsWritten(
-     SourceLocation include_loc,
-     const CharacterDataGetterInterface& data_getter) {
--  const string data = GetSourceTextUntilEndOfLine(include_loc, data_getter);
-+  const string data = GetSourceTextUntilEndOfLine(include_loc, data_getter).str();
-   if (data.empty())
-     return data;
-   string::size_type endpos = string::npos;
-diff --git a/iwyu_location_util.h b/iwyu_location_util.h
-index 3892a424..6f8cf81c 100644
---- a/iwyu_location_util.h
-+++ b/iwyu_location_util.h
-@@ -89,7 +89,7 @@ bool IsInScratchSpace(clang::SourceLocation loc);
- 
- inline string GetFilePath(const clang::FileEntry* file) {
-   return (IsBuiltinFile(file) ? "<built-in>" :
--          NormalizeFilePath(file->getName()));
-+          NormalizeFilePath(file->getName().str()));
- }
- 
- //------------------------------------------------------------
-diff --git a/iwyu_output.cc b/iwyu_output.cc
-index ca145710..8666c26c 100644
---- a/iwyu_output.cc
-+++ b/iwyu_output.cc
-@@ -168,7 +168,7 @@ string GetKindName(const clang::TagDecl* tag_decl) {
-   if (const FakeNamedDecl* fake = FakeNamedDeclIfItIsOne(named_decl)) {
-     return fake->kind_name();
-   }
--  return tag_decl->getKindName();
-+  return tag_decl->getKindName().str();
- }
- 
- string GetQualifiedNameAsString(const clang::NamedDecl* named_decl) {
-diff --git a/iwyu_path_util.cc b/iwyu_path_util.cc
-index ab4fc800..9987ea47 100644
---- a/iwyu_path_util.cc
-+++ b/iwyu_path_util.cc
-@@ -134,7 +134,7 @@ string NormalizeFilePath(const string& path) {
-   std::replace(normalized.begin(), normalized.end(), '\\', '/');
- #endif
- 
--  return normalized.str();
-+  return normalized.str().str();
- }
- 
- string NormalizeDirPath(const string& path) {
-@@ -154,14 +154,14 @@ string MakeAbsolutePath(const string& path) {
-   std::error_code error = llvm::sys::fs::make_absolute(absolute_path);
-   CHECK_(!error);
- 
--  return absolute_path.str();
-+  return absolute_path.str().str();
- }
- 
- string MakeAbsolutePath(const string& base_path, const string& relative_path) {
-   llvm::SmallString<128> absolute_path(base_path);
-   llvm::sys::path::append(absolute_path, relative_path);
- 
--  return absolute_path.str();
-+  return absolute_path.str().str();
- }
- 
- string GetParentPath(const string& path) {
-diff --git a/iwyu_preprocessor.cc b/iwyu_preprocessor.cc
-index 58e78595..88b93144 100644
---- a/iwyu_preprocessor.cc
-+++ b/iwyu_preprocessor.cc
-@@ -313,7 +313,7 @@ void IwyuPreprocessorInfo::ProcessHeadernameDirectivesInFile(
-       break;
-     }
-     const string filename = GetSourceTextUntilEndOfLine(current_loc,
--                                                        DefaultDataGetter());
-+                                                        DefaultDataGetter()).str();
-     // Use "" or <> based on where the file lives.
-     string quoted_private_include;
-     if (IsSystemIncludeFile(GetFilePath(current_loc)))
-@@ -332,7 +332,7 @@ void IwyuPreprocessorInfo::ProcessHeadernameDirectivesInFile(
-     }
- 
-     string after_text = GetSourceTextUntilEndOfLine(current_loc,
--                                                    DefaultDataGetter());
-+                                                    DefaultDataGetter()).str();
-     const string::size_type close_brace_pos = after_text.find('}');
-     if (close_brace_pos == string::npos) {
-       Warn(current_loc, "@headername directive missing a closing brace");
diff --git a/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch b/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
deleted file mode 100644
index 663a883fa91..00000000000
--- a/srcpkgs/include-what-you-use/files/include-what-you-use-002-clang-astdumper.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 30549c6931972456d1e09ff5dbeecd258a8df72b Mon Sep 17 00:00:00 2001
-From: Kim Grasman <kim.grasman@gmail.com>
-Date: Thu, 9 Jul 2020 18:47:56 +0200
-Subject: [PATCH] Implement Stmt printing with ASTDumper
-
-The Clang API changed in commit 473fbc90d1fbf17e so that Stmt::dump
-takes an ASTContext instead of a SourceManager.
-
-Rather than wire a global ASTContext, reimplement PrintableStmt and
-PrintStmt to duplicate the most trivial implementations not requiring
-ASTContext.
-
-No functional change.
----
- iwyu_ast_util.cc | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/iwyu_ast_util.cc b/iwyu_ast_util.cc
-index d3d4dd1f..b19a11fb 100644
---- a/iwyu_ast_util.cc
-+++ b/iwyu_ast_util.cc
-@@ -25,6 +25,7 @@
- #include "llvm/Support/Casting.h"
- #include "llvm/Support/raw_ostream.h"
- #include "clang/AST/ASTContext.h"
-+#include "clang/AST/ASTDumper.h"
- #include "clang/AST/CanonicalType.h"
- #include "clang/AST/Decl.h"
- #include "clang/AST/DeclBase.h"
-@@ -46,6 +47,7 @@ namespace clang {
- class FileEntry;
- }  // namespace clang
- 
-+using clang::ASTDumper;
- using clang::BlockPointerType;
- using clang::CXXConstructExpr;
- using clang::CXXConstructorDecl;
-@@ -450,12 +452,14 @@ string PrintableDecl(const Decl* decl, bool terse/*=true*/) {
- string PrintableStmt(const Stmt* stmt) {
-   std::string buffer;
-   raw_string_ostream ostream(buffer);
--  stmt->dump(ostream, *GlobalSourceManager());
-+  ASTDumper dumper(ostream, /*ShowColors=*/false);
-+  dumper.Visit(stmt);
-   return ostream.str();
- }
- 
- void PrintStmt(const Stmt* stmt) {
--  stmt->dump(*GlobalSourceManager());  // This prints to errs().
-+  ASTDumper dumper(llvm::errs(), /*ShowColors=*/false);
-+  dumper.Visit(stmt);
- }
- 
- string PrintableType(const Type* type) {
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 3811309bdde..4457485233c 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,8 +1,8 @@
 # Template file for 'include-what-you-use'
 pkgname=include-what-you-use
-version=0.14
-revision=2
-wrksrc="${pkgname}"
+version=0.15
+revision=1
+create_wrksrc="yes"
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
 make_build_args="VERBOSE=1"
@@ -12,15 +12,9 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="NCSA"
 homepage="https://include-what-you-use.org/"
 distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
-checksum=43184397db57660c32e3298a6b1fd5ab82e808a1f5ab0591d6745f8d256200ef
+checksum=2bd6f2ae0d76e4a9412f468a5fa1af93d5f20bb66b9e7bf73479c31d789ac2e2
 python_version=3
 
-post_extract() {
-	for i in ${FILESDIR}/include-what-you-use-*.patch; do
-		patch -sNp1 -i ${i}
-	done
-}
-
 post_install() {
 	vlicense LICENSE.TXT
 }

From b226aedcce80998c2a97ff5d729e0f3ee4b650f5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Nov 2020 15:24:18 +0100
Subject: [PATCH 0344/3595] sysstat: update to 12.4.1.

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

diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 5b5b1b9c8c7..70c526312f7 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
 # Template file for 'sysstat'
 pkgname=sysstat
-version=12.4.0
+version=12.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://pagesperso-orange.fr/sebastien.godard/"
 distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=78556c339795ecd07eb10ee09e3f5d52901d3a29f874ae92b45efd0de7b62d16
+checksum=24af8d4eff5118a18f67d5eadda843b9cb9fd29ae4922c0e8b8399621313ce0b
 
 post_extract() {
 	vsed -i 's/lib64/lib/' configure

From 9515a060998619a771ad8c565d880107e7644f33 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 21 Nov 2020 14:52:36 -0700
Subject: [PATCH 0345/3595] youtube-dl: update to 2020.11.21.1

---
 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 8f2945c9934..d6b4e21143b 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.11.19
+version=2020.11.21.1
 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/latest/${pkgname}-${version}.tar.gz"
-checksum=f8c14d9eb2fd8fe7242de8b96f2c918810867c518a162405644f483dcd14be9e
+checksum=d4b173bb1113bc1641cf130d088976bb8d1484f6bd5937872c1f89b1e28e3429
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 3efbbe656c8db2641006195d453457eaf50de0db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 22 Nov 2020 09:54:23 -0500
Subject: [PATCH 0346/3595] python3-scour: update to 0.38.2.

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

diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template
index cf86a2354b0..5dd2d4f0a48 100644
--- a/srcpkgs/python3-scour/template
+++ b/srcpkgs/python3-scour/template
@@ -1,21 +1,16 @@
 # Template file for 'python3-scour'
 pkgname=python3-scour
-version=0.38.1.post1
+version=0.38.2
 revision=1
 wrksrc="scour-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-six"
-checkdepends="python3-six"
 short_desc="SVG scrubber (Python3)"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="Apache-2.0"
 homepage="https://github.com/scour-project/scour"
 changelog="https://raw.githubusercontent.com/scour-project/scour/master/HISTORY.md"
 distfiles="${PYPI_SITE}/s/scour/scour-${version}.tar.gz"
-checksum=81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145
+checksum=6881ec26660c130c5ecd996ac6f6b03939dd574198f50773f2508b81a68e0daf
 conflicts="python-scour>=0"
-
-do_check() {
-	python3 setup.py test
-}

From 96e1ad584b375956f9fa1c0f88db35af8e79ca23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 22 Nov 2020 10:04:38 -0500
Subject: [PATCH 0347/3595] python3-virtualenv: update to 20.2.0.

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 37be07a5fb3..91775e9d370 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,20 +1,24 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.1.0
+version=20.2.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="$depends"
+checkdepends="tox python3-devel $depends"
 short_desc="Virtual Python environment builder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://virtualenv.pypa.io/"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380
+checksum=fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
+do_check() {
+	tox -e py${py3_ver/./}
+}
+
 post_install() {
 	mv $DESTDIR/usr/bin/virtualenv $DESTDIR/usr/bin/virtualenv3
 	vlicense LICENSE

From 14241e6f0f532bf7082434876ee0d10ec3a36d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 14:59:20 +0100
Subject: [PATCH 0348/3595] tectonic: update to 0.3.3.

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

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 98978d07ec8..709c265d4aa 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,6 +1,6 @@
 # Template file for 'tectonic'
 pkgname=tectonic
-version=0.2.0
+version=0.3.3
 revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"
 homepage="https://tectonic-typesetting.github.io"
 distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=fce39a26b8a88c662de114ce38f407f234e255c4cef6ea825e85358e936b9bbd
+checksum=c0aa60186f2e7f37af67dafbdccfc7a99ca5ce084651d8fcabe7561b941dcb97
 
 post_install() {
 	vlicense LICENSE

From 33df8e6fc7f3a93f59576a2c9b603e150c15d665 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 22 Nov 2020 18:39:03 +0100
Subject: [PATCH 0349/3595] font-cozette: update to 1.9.3.

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

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 8c721033eb7..88b606f7a69 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.9.2
+version=1.9.3
 revision=1
 create_wrksrc=yes
 hostmakedepends="font-util"
@@ -10,7 +10,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
 distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=25d7a93aca70754c78e9b88ec7b6185b6bbe9f0a9344f109c4cccb6cea89a9d2
+checksum=8104e960dca987c2836c79215c30141e3203d1cf5ac34e0863fa0549ba235f55
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {

From f4167b1fa02818a07ca2ef562031efe25ea9cf87 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 22 Nov 2020 19:41:34 +0100
Subject: [PATCH 0350/3595] flinks: update to 0.5.0.

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

diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index 551b119289d..e4fac93a22e 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -1,17 +1,17 @@
 # Template file for 'flinks'
 pkgname=flinks
-version=0.4.3
-revision=6
+version=0.5.0
+revision=1
 build_style=python3-module
-pycompile_module="flinkspkg"
 hostmakedepends="python3-setuptools"
 depends="lynx python3"
 short_desc="Text-mode flashing word web browser for speed-reading and/or skimming"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://mbays.freeshell.org/flinks/"
-distfiles="http://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
-checksum=ca5c3a8bc651befcb75b4f2542519bb34a36caccb52f141ddcc7b184fedcebd0
+homepage="https://mbays.freeshell.org/flinks/"
+changelog="https://mbays.freeshell.org/flinks/ChangeLog"
+distfiles="https://mbays.freeshell.org/flinks/flinks-${version}.tar.gz"
+checksum=e2834ca2309cbc02693f9bdacd860045bb6d3a9ef8bd0a54ee2f1c373a366266
 
 post_install() {
 	vdoc README

From a82cac646a8f81efc0b5b0219037873bc23f99bf Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 22 Nov 2020 23:15:05 +0100
Subject: [PATCH 0351/3595] switchboard: rebuild

there was a dependency on libgee, but libgee is long gone from
the void-packages repo (there's probably a lingering package in
the binary repos, so the switchboard-plug-network rebuild did not
fail on the builders, but it failed in my clean repos)
---
 srcpkgs/switchboard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 295b27a5787..45031a8d8b7 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,10 +1,10 @@
 # Template file for 'switchboard'
 pkgname=switchboard
 version=2.3.7
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibunity=false"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3bc3c973f7f18468a444e70cba9f597ce42591ac Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:16:07 +0600
Subject: [PATCH 0352/3595] gnome-calculator: update to 3.38.2.

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index de81e48969e..220324d3e3c 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.0
+version=3.38.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calculator"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=902e23ff550692b02459e14d6ebba8b670663a9f4af0d98ee52fadea895b57fe
+checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b

From 61b86f50b890fd02a01a6e370ed3f65e87423b2e Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:40:49 +0600
Subject: [PATCH 0353/3595] gnome-maps: update to 3.38.2.

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

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 48fe66691d1..6f15a99ba1d 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9ef0e3705e00b5ff47d743452e5f550e726112aaf43c385bed3c599fa877e7b
+checksum=a1a73ca6a47435add25f8fa022ed016c84dd2db3ef4976a8280721d3ea80465d

From 22b606625141d990114e6cc121963ff3a60d0ca1 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 03:53:57 +0600
Subject: [PATCH 0354/3595] gnome-2048: update to 3.38.2.

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

diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template
index 9bc161700a6..6c7a9889c01 100644
--- a/srcpkgs/gnome-2048/template
+++ b/srcpkgs/gnome-2048/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-2048'
 pkgname=gnome-2048
-version=3.38.0
+version=3.38.2
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/2048"
 distfiles="${GNOME_SITE}/gnome-2048/${version%.*}/gnome-2048-${version}.tar.xz"
-checksum=4c257f9799085263070a88acf5fbc8f7aae075ac8d56dca3e63dd982607123c9
+checksum=e27367f5c09a0136581d335f57913aaf5a5f180e3299cc5c1a30d8583e79ae68

From b23c68d128d250214c48dabbb178c34f64cca584 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:26:16 +0600
Subject: [PATCH 0355/3595] gnome-tetravex: update to 3.38.2.

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

diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index c667354e090..78f0ef176f3 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tetravex'
 pkgname=gnome-tetravex
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=meson
 hostmakedepends="gettext itstool pkg-config vala glib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tetravex"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0e92b8a7e7a175f441980daa8fa2035cb47bb2df777bce6ffe31252ad7e068
+checksum=1fcdf10979b9a3526009d783a1c88a389918f360da4edb44fba25c71f186911b

From 2087a504fb1859f9d6fe1ce9188f700c6a97fa9f Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:37:15 +0600
Subject: [PATCH 0356/3595] gnome-klotski: update to 3.38.2.

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

diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index d3577c0e802..c1ddd4a7d11 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-klotski'
 pkgname=gnome-klotski
-version=3.38.1
+version=3.38.2
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Klotski"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bda0d438b98ae8df3fc280e4cfd801a33e7121a4d601d005e171900be893c03
+checksum=91637845649f3ca709d29f71ee775b946d1112087209f32264e8fad21a0ca0e2

From bd1f0d14c5b6f7705a23574db62e4d019fcd5b56 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 23 Nov 2020 04:55:52 +0600
Subject: [PATCH 0357/3595] gnome-mahjongg: update to 3.38.3.

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

diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index bc00cfc81c1..3c8f2e7039e 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mahjongg'
 pkgname=gnome-mahjongg
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
+configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel gtk+3-devel libglib-devel"
 short_desc="GNOME Mahjongg solitaire game"
@@ -10,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=928708b4c625cad4b05199ca2948f6a545bfab368a1fc576feed0a7432e454f3
+checksum=d2b1e47d85852048b35d89e3ddaba1daeb06aaf97acfb67a501ce664ff509190

From 8d4e62cb50ae969e018a79f1e9c5e4e9e714506d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:15:10 +0700
Subject: [PATCH 0358/3595] iscan: update to 2.30.4.

---
 srcpkgs/iscan/template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index 41ed3dc7fa7..18c0d969766 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,30 +1,30 @@
 # Template file for 'iscan'
 pkgname=iscan
-version=2.30.3
-revision=3
-_srcrev=1
-repository=nonfree
+version=2.30.4
+revision=1
+_srcrev=2
+archs="i686 x86_64"
 build_style=gnu-configure
 configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
-LDFLAGS="-ldl -lpng16"
-maintainer="Orphaned <orphan@voidlinux.org>"
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
 depends="sane-epkowa"
-license="GPL-2, AVASYSPL"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! front-end"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, custom:EPSON"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
-checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
-archs="i686 x86_64"
+checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
+repository=nonfree
+LDFLAGS="-ldl -lpng16"
 
 post_configure() {
 	# fix wrongly created link
-	sed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
+	vsed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
 }
 
 post_install() {
-	vlicense non-free/AVASYSPL.en.txt
+	vlicense non-free/COPYING.EPSON.en.txt
 	vmkdir usr/lib/gimp/2.0/plug-ins
 	ln -s /usr/bin/iscan ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
 	vinstall iscan.desktop 644 usr/share/applications
@@ -32,7 +32,7 @@ post_install() {
 
 sane-epkowa_package() {
 	short_desc="SANE backend for EPSON scanners"
-	license="GPL-2"
+	license="GPL-2.0-or-later"
 	unset repository
 	depends="sane iscan-data"
 	conf_files="/etc/sane.d/epkowa.conf"

From 985653d6b3103ef108cda821ffcc0c4a5313d8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:15:13 +0700
Subject: [PATCH 0359/3595] iscan-data: update to 1.39.2.

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

diff --git a/srcpkgs/iscan-data/template b/srcpkgs/iscan-data/template
index 2953cb34344..b5e90ed990c 100644
--- a/srcpkgs/iscan-data/template
+++ b/srcpkgs/iscan-data/template
@@ -1,14 +1,13 @@
 # Template file for 'iscan-data'
 pkgname=iscan-data
-version=1.39.0
-revision=2
+version=1.39.2
+revision=1
 _srcrev=1
-archs=noarch
 build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
 hostmakedepends="libxslt"
-license="GPL-2"
-homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! data files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 distfiles="http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}-${_srcrev}.tar.gz"
-checksum=61ef9496568c8709cce7687de0d47e4b132a00fa6a398fcbb6f06f8fdf31755f
+checksum=6a62bc6e84257714785d99316a017b8444207e3dcf56d35d0ce13f292d855824

From 202c12600b128312e7a028a752e922c497b5e616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 22 Nov 2020 18:31:03 -0300
Subject: [PATCH 0360/3595] .github/workflows/build: don't skip CI when PR is a
 draft.

When a PR is marked as ready for review (no longer a draft), CI isn't
re-run automatically, so no tests are run until the PR is updated. Even
trying to manually re-run the jobs doesn't fix this, since GH appears to
remember the PR state instead of using the current one.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8c0cdccf5d4..33186037f8d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,7 +26,7 @@ jobs:
   build:
     name: Build packages
     runs-on: ubuntu-18.04
-    if: "!github.event.pull_request.draft && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
+    if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
       image: 'voidlinux/masterdir-${{ matrix.config.bootstrap }}:20200607RC01'

From 6a857ed3947d7797bf2d941c1ee7e9be86b5c471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 23 Nov 2020 02:18:16 +0100
Subject: [PATCH 0361/3595] tali: update to 3.38.2

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

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index fd698c5032d..d3b18e563a3 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
 # Template file for 'tali'
 pkgname=tali
-version=3.38.0
+version=3.38.2
 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=29ee0cb37ba7bac7cc3d8356bcdd91a202eac999dcef79326e3a98ab2234cea4
+checksum=4fb9f7ee8cc0eb89010408c42cb0b1f83e839ac8e9b644ec3ddf564508431691

From 683532bea1b9b38878544aa71e4d5f3750ed7f82 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:39:28 +0100
Subject: [PATCH 0362/3595] bison: update to 3.7.4.

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

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

From cbc19c9b7beb1e6278f6ea40195eb66312de2669 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 21 Nov 2020 16:09:38 -0800
Subject: [PATCH 0363/3595] lxd: update to 4.8.

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

diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index bf9b207d7f1..0b3d30a96eb 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxd'
 pkgname=lxd
-version=4.7
+version=4.8
 revision=1
 build_style=go
 go_import_path=github.com/lxc/lxd
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/lxd"
 distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=011745a66e971d95ada088dc42a9154028393de86871ea3ef4ff91a2976525ed
+checksum=de4f096c71448ceb358c0d0d63e34d17ea8e49c15eb9d4f8af5030ce0535337f
 system_groups="lxd"
 
 # whitelist libcap LDFLAGS (see: https://github.com/lxc/lxd/issues/6727)

From db76d8b33c8830c70ac72a396acc46e5270470c9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 19:09:24 -0600
Subject: [PATCH 0364/3595] python3-pulsectl: update to 20.5.1

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

diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index f998bf15d31..79fe26537e8 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
-version=19.10.4
-revision=2
+version=20.5.1
+revision=1
 wrksrc="pulsectl-${version}"
 build_style=python3-module
-pycompile_module="pulsectl"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
@@ -13,7 +12,7 @@ license="MIT"
 homepage="https://github.com/mk-fg/python-pulse-control"
 changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=137e38017960d7fc42677da12b703da42359c94803c80407ea5dddae363ba1f6
+checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db
 
 post_install() {
 	vlicense COPYING

From 3a7f2e7c09a297f69baa99fef4801ac4bc7112fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 14:29:32 +0100
Subject: [PATCH 0365/3595] bfs: update to 2.1.

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

diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index bad966eee44..68ccaff63a4 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.0
+version=2.1
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
@@ -11,7 +11,7 @@ license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=afbde70742f4bac3f3b030b36531fe0bd67dbdda61ce0457f3a1e5681405df33
+checksum=be51966ca3bcc0167fb16c89f81fa37ee13c6326c616c31b87fd564a54bdc5f2
 
 post_install() {
 	vlicense LICENSE

From b3148b48e6cc7ffabc2e2b9d76b3fe8ea758057a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 15:05:27 +0100
Subject: [PATCH 0366/3595] btfs: update to 2.23.

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

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 35884c436b9..b70ea7d79be 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
-version=2.22
-revision=2
+version=2.23
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
@@ -11,7 +11,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/johang/btfs"
 distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=03ebfffd7cbd91e2113d0c43d8d129ad7851753c287c326416ecf622789c4a8d
+checksum=2832817ea3aa73ff7af60a547736d0a681111816d95b76a999935b6f90491fa6
 
 pre_configure() {
 	autoreconf -fi

From c98cc5db85c3a3fa3063d7fbd10959f9dc1bfa85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 Nov 2020 15:14:20 +0100
Subject: [PATCH 0367/3595] mpd: update to 0.22.3.

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 8e3de99fec6..8ce4f1799a7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.1
+version=0.22.3
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=408464093d09c73ceecafc201defcbaba2193cb30ad0aaf1241459a410fecaf3
+checksum=338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 patch_args="-Np1"
 

From 2e02786494d550d65dca02560c610d4560f109d9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 Nov 2020 22:56:08 +0200
Subject: [PATCH 0368/3595] gmusicbrowser: update to 1.1.16.

---
 ...840eb9dad0b59ad2dac5d303f5929b2f09f21.diff | 26 -------------------
 srcpkgs/gmusicbrowser/template                |  9 +++----
 2 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff

diff --git a/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff b/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
deleted file mode 100644
index b27e8cccf80..00000000000
--- a/srcpkgs/gmusicbrowser/patches/853840eb9dad0b59ad2dac5d303f5929b2f09f21.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
-index bbf16d7..18fab6a 100755
---- gmusicbrowser.pl
-+++ gmusicbrowser.pl
-@@ -9020,7 +9020,7 @@ sub Set
- 
- 	($cmd,my $pattern)= split /:/,$cmd,2;
- 	$pattern='' unless defined $pattern;
--	my ($basecmd,my $prop)= Songs::filter_properties($field,"$cmd:$pattern");
-+	my ($basecmd, $prop)= Songs::filter_properties($field,"$cmd:$pattern");
- 	if (!$prop)
- 	{	$cmd=  Songs::Field_property($field,'default_filter');
- 		($basecmd,$prop)= Songs::filter_properties($field,$cmd);
-diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
-index 76d2f86..26d21ae 100644
---- gmusicbrowser_list.pm
-+++ gmusicbrowser_list.pm
-@@ -8052,7 +8052,7 @@ sub Make
- 			unless ($notnow)
- 			{	#warn "$key ---found in ($code,@deps)\n";
- 				if (ref $code)
--				{	my ($func,my @keys)=@$code; #warn " -> ($func, @keys)\n";
-+				{	my ($func, @keys)=@$code; #warn " -> ($func, @keys)\n";
- 					my $out=join ',',map "'$_'", @keys;
- 					my $in= join ',',map "'$_'", @deps; $in=~s#\?##g;
- 					$out= @keys>1 ? "\@var{$out}" : "\$var{$out}";
diff --git a/srcpkgs/gmusicbrowser/template b/srcpkgs/gmusicbrowser/template
index a84cce8f01a..050a2272ae7 100644
--- a/srcpkgs/gmusicbrowser/template
+++ b/srcpkgs/gmusicbrowser/template
@@ -1,17 +1,16 @@
 # Template file for 'gmusicbrowser'
 pkgname=gmusicbrowser
-version=1.1.15
-revision=7
-archs=noarch
+version=1.1.16
+revision=1
 hostmakedepends="perl gettext"
 depends="perl-Gtk2 perl-Glib-Object-Introspection gst-plugins-good1
- gst-plugins-bad1 gst-plugins-ugly1"
+ gst-plugins-bad1 gst-plugins-ugly1 perl-Net-DBus"
 short_desc="Open-source jukebox for large collections"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-only"
 homepage="http://gmusicbrowser.org"
 distfiles="http://gmusicbrowser.org/download/${pkgname}-${version}.tar.gz"
-checksum=1ec881d148ccc26bdbab66ca701fd2216e034c3b613d6e66c17ac702271c677b
+checksum=c7f10578ca3008e966e66c33a4887020e4b99b6aa5580c4b4771ee228ff603fe
 
 do_install() {
 	make prefix=${DESTDIR}/usr install

From 41efaec56ef46278544fb438c94db487010cfdd5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 14:47:41 -0600
Subject: [PATCH 0369/3595] gmsh: update to 4.7.1

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

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index 2b11cd57cf3..0a499e40b13 100644
--- a/srcpkgs/gmsh/template
+++ b/srcpkgs/gmsh/template
@@ -1,6 +1,6 @@
 # Template file for 'gmsh'
 pkgname=gmsh
-version=4.7.0
+version=4.7.1
 revision=1
 wrksrc="${pkgname}-${version}-source"
 build_style=cmake
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://gmsh.info"
 changelog="http://gmsh.info/CHANGELOG.txt"
 distfiles="https://gmsh.info/src/gmsh-${version}-source.tgz"
-checksum=e27f32f92b374ba2a746a9d9c496401c13f66ac6e3e70753e16fa4012d14320e
+checksum=c984c295116c757ed165d77149bd5fdd1068cbd7835e9bcd077358b503891c6a
 
 build_options="fltk hxt zipper"
 build_options_default="hxt"

From 5efe6491f89ba97637b6b7d73370bd838056c3e3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 21 Nov 2020 20:06:06 -0600
Subject: [PATCH 0370/3595] krfb: update to 20.08.3

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

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index fff3d2107de..39382d322d3 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda
+checksum=d32986a6952723c5a5ae3744ef090f2f0165082e3f152e0ee6a340d8d8bade8e

From 5a9afec567d8d9433a8bb79923c174798b1d39a7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 19 Nov 2020 23:41:20 +0200
Subject: [PATCH 0371/3595] k3b: update to 20.08.3.

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

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 6fca88b4f29..3ec3c3bd56b 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f
+checksum=9d81f1b859dca68a781903f35b3186a9864222c8bb2c85cd7e9481d79eb9e261

From ad44b639dd124d048efe5c0871369cf109bee102 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Nov 2020 00:06:45 +0200
Subject: [PATCH 0372/3595] gist: update to 6.0.0.

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

diff --git a/srcpkgs/gist/template b/srcpkgs/gist/template
index 39759f57e23..d5eaaffa360 100644
--- a/srcpkgs/gist/template
+++ b/srcpkgs/gist/template
@@ -1,8 +1,7 @@
 # Template file for 'gist'
 pkgname=gist
-version=5.1.0
+version=6.0.0
 revision=1
-archs=noarch
 hostmakedepends="ruby"
 depends="ruby"
 short_desc="Uploads content to gist.github.com"
@@ -10,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://defunkt.io/gist/"
 distfiles="https://github.com/defunkt/gist/archive/v${version}.tar.gz"
-checksum=843cea035c137d23d786965688afc9ee70610ac6c3d6f6615cb958d6c792fbb2
+checksum=ddfb33c039f8825506830448a658aa22685fc0c25dbe6d0240490982c4721812
 
 do_build() {
 	rake standalone

From 8b8630878e68796f78f98c782e030bfeb4f5f63d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:17:27 +0200
Subject: [PATCH 0373/3595] geany: update to 1.37.1.

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

diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 9eef9728d52..4a3ac7f2ac9 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.37
+version=1.37.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
@@ -12,8 +12,9 @@ short_desc="Fast and lightweight IDE"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany/master/NEWS"
 distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51
+checksum=18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18
 python_version=3
 
 pre_configure() {

From f766f8bd29afc7fe1c6e00ed3e9776fe19553246 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 19:19:45 +0200
Subject: [PATCH 0374/3595] geany-plugins: update to 1.37.0.

---
 .../geany-plugins/patches/libgit2-1.0.patch   | 54 -------------------
 srcpkgs/geany-plugins/template                |  7 +--
 2 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/geany-plugins/patches/libgit2-1.0.patch

diff --git a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch b/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
deleted file mode 100644
index 2cd070e1041..00000000000
--- a/srcpkgs/geany-plugins/patches/libgit2-1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit c5840bc94d5870b2f8b38ea16853e0c2dd0ac981
-Author: q66 <daniel@octaforge.org>
-Date:   Sun May 3 19:36:54 2020 +0200
-
-    fix build on libgit2-1.0
-
-diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
-index b708319..8d3abaf 100644
---- git-changebar/src/gcb-plugin.c
-+++ git-changebar/src/gcb-plugin.c
-@@ -32,25 +32,6 @@
- #include <geany.h>
- #include <document.h>
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init     git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
--/* 0.23 added @p binary_cb */
--# define git_diff_buffers(old_buffer, old_len, old_as_path, \
--                          new_buffer, new_len, new_as_path, options, \
--                          file_cb, binary_cb, hunk_cb, line_cb, payload) \
--  git_diff_buffers (old_buffer, old_len, old_as_path, \
--                    new_buffer, new_len, new_as_path, options, \
--                    file_cb, hunk_cb, line_cb, payload)
--#endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
--# define git_buf_dispose  git_buf_free
--# define git_error_last   giterr_last
--#endif
--
--
- GeanyPlugin      *geany_plugin;
- GeanyData        *geany_data;
- 
-diff --git workbench/src/plugin_main.c workbench/src/plugin_main.c
-index 6fa6fc8..b620666 100644
---- workbench/src/plugin_main.c
-+++ workbench/src/plugin_main.c
-@@ -35,13 +35,6 @@
- #include "idle_queue.h"
- #include "tm_control.h"
- 
--
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
--# define git_libgit2_init     git_threads_init
--# define git_libgit2_shutdown git_threads_shutdown
--#endif
--
--
- GeanyPlugin *geany_plugin;
- GeanyData *geany_data;
- 
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 8af71c85368..8038f5f3704 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
-version=1.36.0
-revision=2
+version=1.37.0
+revision=1
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
@@ -14,8 +14,9 @@ short_desc="Geany IDE plugins"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://plugins.geany.org"
+changelog="https://raw.githubusercontent.com/geany/geany-plugins/master/NEWS"
 distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568
+checksum=14df1dda3760eedd3a28daba0788f3bee5b83ae31f042c57a78c20f37a77eb28
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 843ed10573f54de61e3656709de2d799ce4379b1 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Wed, 18 Nov 2020 18:04:52 -0500
Subject: [PATCH 0375/3595] amfora: update to 1.6.0.

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

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 55a83e1798a..f44c714be21 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
 # Template file for 'amfora'
 pkgname=amfora
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="Stacy Harper <contact@stacyharper.net>"
 license="GPL-3.0-only"
 homepage="https://github.com/makeworld-the-better-one/amfora"
 distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8478b00155ad74712b957444b7afe025a74030907b77cca0903b6477f79843d
+checksum=a02b070679718953a4184ef2b7fbeccfcdf9bf227ca1efab34ee0d7fa21e9bd9

From 070e8d29de333555dba063962c91a7cb1b1ea5c4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 16:22:25 -0600
Subject: [PATCH 0376/3595] rabbitmq-c: update to 0.10.0

---
 .../rabbitmq-c/patches/CVE-2019-18609.patch   | 47 ----------
 srcpkgs/rabbitmq-c/patches/test.patch         | 89 +++++++++++++++++++
 srcpkgs/rabbitmq-c/template                   | 13 +--
 3 files changed, 96 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
 create mode 100644 srcpkgs/rabbitmq-c/patches/test.patch

diff --git a/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch b/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
deleted file mode 100644
index 7f26bfde463..00000000000
--- a/srcpkgs/rabbitmq-c/patches/CVE-2019-18609.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fc85be7123050b91b054e45b91c78d3241a5047a Mon Sep 17 00:00:00 2001
-From: Alan Antonuk <alan.antonuk@gmail.com>
-Date: Sun, 3 Nov 2019 23:50:07 -0800
-Subject: [PATCH] lib: check frame_size is >= INT32_MAX
-
-When parsing a frame header, validate that the frame_size is less than
-or equal to INT32_MAX. Given frame_max is limited between 0 and
-INT32_MAX in amqp_login and friends, this does not change the API.
-
-This prevents a potential buffer overflow when a malicious client sends
-a frame_size that is close to UINT32_MAX, in which causes an overflow
-when computing state->target_size resulting in a small value there. A
-buffer is then allocated with the small amount, then memcopy copies the
-frame_size writing to memory beyond the end of the buffer.
----
- librabbitmq/amqp_connection.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git librabbitmq/amqp_connection.c librabbitmq/amqp_connection.c
-index 034b2e96..b106f70a 100644
---- librabbitmq/amqp_connection.c
-+++ librabbitmq/amqp_connection.c
-@@ -287,12 +287,21 @@ int amqp_handle_input(amqp_connection_state_t state, amqp_bytes_t received_data,
-     case CONNECTION_STATE_HEADER: {
-       amqp_channel_t channel;
-       amqp_pool_t *channel_pool;
--      /* frame length is 3 bytes in */
-+      uint32_t frame_size;
-+
-       channel = amqp_d16(amqp_offset(raw_frame, 1));
- 
--      state->target_size =
--          amqp_d32(amqp_offset(raw_frame, 3)) + HEADER_SIZE + FOOTER_SIZE;
-+      /* frame length is 3 bytes in */
-+      frame_size = amqp_d32(amqp_offset(raw_frame, 3));
-+      /* To prevent the target_size calculation below from overflowing, check
-+       * that the stated frame_size is smaller than a signed 32-bit. Given
-+       * the library only allows configuring frame_max as an int32_t, and
-+       * frame_size is uint32_t, the math below is safe from overflow. */
-+      if (frame_size >= INT32_MAX) {
-+        return AMQP_STATUS_BAD_AMQP_DATA;
-+      }
- 
-+      state->target_size = frame_size + HEADER_SIZE + FOOTER_SIZE;
-       if ((size_t)state->frame_max < state->target_size) {
-         return AMQP_STATUS_BAD_AMQP_DATA;
-       }
diff --git a/srcpkgs/rabbitmq-c/patches/test.patch b/srcpkgs/rabbitmq-c/patches/test.patch
new file mode 100644
index 00000000000..5f87d166798
--- /dev/null
+++ b/srcpkgs/rabbitmq-c/patches/test.patch
@@ -0,0 +1,89 @@
+From 26ecf6d3012be81f5dfb8a2d822c722e916a86cb Mon Sep 17 00:00:00 2001
+From: Simon Lepasteur <simon.lepasteur@swissdotnet.ch>
+Date: Wed, 11 Mar 2020 15:13:29 +0100
+Subject: [PATCH] Add option to run system tests (disabled by default).
+
+System tests require a RabbitMQ or other AMQP server to be running on
+`localhost` at TCP port number 5672 and therefore fails if no such
+server is running on the build machine.
+
+This is surprising for everyone running the standard `make test`
+to ensure the library is built correctly.
+---
+ .travis.yml          | 2 +-
+ CMakeLists.txt       | 1 +
+ README.md            | 2 ++
+ appveyor.yml         | 2 +-
+ tests/CMakeLists.txt | 8 +++++---
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git .travis.yml .travis.yml
+index 52a66b9c..5f56cb03 100644
+--- .travis.yml
++++ .travis.yml
+@@ -19,7 +19,7 @@ addons:
+       name: "alanxz/rabbitmq-c"
+       description: "C AMQP client for RabbitMQ"
+     notification_email: alan.antonuk@gmail.com
+-    build_command_prepend: mkdir build && pushd build && cmake .. && popd
++    build_command_prepend: mkdir build && pushd build && cmake .. -DRUN_SYSTEM_TESTS=ON && popd
+     build_command: cmake --build ./build
+     branch_pattern: coverity_scan
+ 
+diff --git CMakeLists.txt CMakeLists.txt
+index f620ddc8..a39645f4 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
+ option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
+ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
+ option(BUILD_API_DOCS "Build Doxygen API docs" ${DOXYGEN_FOUND})
++option(RUN_SYSTEM_TESTS "Run system tests (i.e. tests requiring an accessible RabbitMQ server instance on localhost)" OFF)
+ 
+ if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
+diff --git README.md README.md
+index b7776c65..31347b15 100644
+--- README.md
++++ README.md
+@@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake:
+    default this is ON if the OpenSSL headers and library can be found.
+ * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by
+    default this is OFF
++* `RUN_SYSTEM_TESTS=ON/OFF` toggles building the system tests (i.e. tests requiring 
++   an accessible RabbitMQ server instance on localhost), by default this is OFF
+ 
+ ## Running the examples
+ 
+diff --git appveyor.yml appveyor.yml
+index 7e41c099..af315227 100644
+--- appveyor.yml
++++ appveyor.yml
+@@ -30,7 +30,7 @@ install:
+   - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART"
+ 
+ before_build:
+-  - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
++  - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=ON -DRUN_SYSTEM_TESTS=ON -DENABLE_SSL_SUPPORT=True -G"%GENERATOR%" .
+ 
+ build:
+   project: ALL_BUILD.vcxproj
+diff --git tests/CMakeLists.txt tests/CMakeLists.txt
+index cf042b04..320a73d7 100644
+--- tests/CMakeLists.txt
++++ tests/CMakeLists.txt
+@@ -33,9 +33,11 @@ add_executable(test_basic
+                test_basic.c)
+ target_link_libraries(test_basic rabbitmq-static)
+ 
+-if (NOT APPLE)
+-  add_test(basic test_basic)
+-endif()
++if (RUN_SYSTEM_TESTS)
++  if (NOT APPLE)
++    add_test(basic test_basic)
++  endif()
++endif(RUN_SYSTEM_TESTS)
+ 
+ add_executable(test_sasl_mechanism test_sasl_mechanism.c)
+ target_link_libraries(test_sasl_mechanism rabbitmq-static)
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 4d6533bf209..606905e2161 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,8 +1,9 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
-version=0.9.0
-revision=3
+version=0.10.0
+revision=1
 build_style=cmake
+make_check_target=test
 hostmakedepends="popt xmlto doxygen"
 makedepends="libressl-devel"
 short_desc="RabbitMQ C client"
@@ -10,10 +11,10 @@ maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"
 homepage="https://github.com/alanxz/rabbitmq-c"
 distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz"
-checksum=316c0d156452b488124806911a62e0c2aa8a546d38fc8324719cd29aaa493024
+checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0
 
 post_install() {
-	vlicense LICENSE-MIT
+	vlicense LICENSE-MIT LICENSE
 }
 
 rabbitmq-c-devel_package() {
@@ -22,7 +23,7 @@ rabbitmq-c-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }

From 4180f305bcfcf2addd61c5bbd378b1e07ab4613e Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 13:23:12 +0900
Subject: [PATCH 0377/3595] coq: remove an unnecessary make argument

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/coq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 01a7829b50f..469975f5119 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -22,7 +22,7 @@ do_configure() {
 }
 
 do_build() {
-	make PR_O=
+	make
 }
 
 do_install() {

From 5190f3c50d7c93a21467ea5fd0b994139c8eec5c Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Thu, 19 Nov 2020 13:23:31 +0900
Subject: [PATCH 0378/3595] ocaml-num: fix xlint errors and license type

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

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index 1a9282ac2e5..736c1361b3d 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -2,22 +2,23 @@
 pkgname=ocaml-num
 version=1.4
 revision=1
+wrksrc="num-${version}"
 build_style=gnu-makefile
-makedepends="ocaml ocaml-findlib"
 make_install_target="findlib-install"
+makedepends="ocaml ocaml-findlib"
 short_desc="OCaml legacy Num library for arbitrary-precision integers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="custom: LGPL-2.1-only with OCaml-LGPL-linking-exception"
 homepage="https://github.com/ocaml/num"
 distfiles="https://github.com/ocaml/num/archive/v${version}.tar.gz"
 checksum=015088b68e717b04c07997920e33c53219711dfaf36d1196d02313f48ea00f24
-wrksrc="num-${version}"
 nocross=yes
 
 pre_install() {
 	export OCAMLFIND_DESTDIR=${DESTDIR}/usr/lib/ocaml
 	vmkdir /usr/lib/ocaml/stublibs
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 2f8744b2906d01ff158307c95bf97e46c39db8cd Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Sat, 14 Nov 2020 19:02:38 -0600
Subject: [PATCH 0379/3595] teamspeak3: update to 3.5.5.

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

diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template
index a86d62c1ef1..f24ae7ccfec 100644
--- a/srcpkgs/teamspeak3/template
+++ b/srcpkgs/teamspeak3/template
@@ -1,6 +1,6 @@
 # Template file for 'teamspeak3'
 pkgname=teamspeak3
-version=3.5.3
+version=3.5.5
 revision=1
 archs="i686 x86_64"
 wrksrc=teamspeak3
@@ -21,11 +21,11 @@ noverifyrdeps=yes
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_pkg="TeamSpeak3-Client-linux_amd64-${version}"
 	distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
-	checksum=ca9cdb5409042c86f2981dd32e046b7f8de4aab6a8333edc7e1fb83eb3d8e93a
+	checksum=53626d9b1f3614f165b0a0469e211e13e5d7f885bb4564a8387ea4184bb1c98d
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="TeamSpeak3-Client-linux_x86-${version}"
 	distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
-	checksum=86a6513d36b9d454171278b03229a290f3548343a604f2fdf31db17c6584275a
+	checksum=875b936da806477af88d837db6960ac353a9c3596280a2f1399569f2b1122c3b
 else
 	broken="No known upstream client for this architecture"
 fi

From 2a7c6cfeae294074ed38b45161454dd2736866d2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 18 Nov 2020 13:50:22 +0200
Subject: [PATCH 0380/3595] ktuberling: update to 20.08.3.

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

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 2b63ca9f9d0..12421ca27c5 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6
+checksum=bfe6092dc7238a55fb733f2c212cad31738dfb4e1661778e2a06176e6cb5de60

From 3f6d36df3c8d20238c93da2b5b9bd80e797ace23 Mon Sep 17 00:00:00 2001
From: Kevin Crumb <kevcrumb@splitlinux.org>
Date: Thu, 5 Nov 2020 10:28:54 +0000
Subject: [PATCH 0381/3595] surf: add "xprop" runtime dependency

Without `xprop` visiting sites via Ctrl-g fails.
---
 srcpkgs/surf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template
index 9470efecbbf..b4937c4894f 100644
--- a/srcpkgs/surf/template
+++ b/srcpkgs/surf/template
@@ -1,10 +1,11 @@
 # Template file for 'surf'
 pkgname=surf
 version=2.0
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="webkit2gtk-devel"
+depends="xprop"
 short_desc="Simple web browser based on WebKit/GTK+"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 561d0c4f049619f5ceb68e1d77ad301f4c022206 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 21 Nov 2020 18:38:32 +0400
Subject: [PATCH 0382/3595] libksba: update to 1.5.0.

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

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index 4848f837d62..61037bbd4aa 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,6 +1,6 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=gnu-configure
 makedepends="libgpg-error-devel"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later,LGPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libksba/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6
+checksum=ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"
@@ -17,6 +17,7 @@ libksba-devel_package() {
 	pkg_install() {
 		vmove usr/bin/ksba-config
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/share/aclocal
 		vmove "usr/lib/*.so"
 	}

From 8541d9f6752ec497683bcbb799e34af0a7989d02 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:26:48 +0100
Subject: [PATCH 0383/3595] mit-krb5: update to 1.18.3.

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

diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 89168f65093..004e0e02dbe 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -2,7 +2,7 @@
 # if there is a bump in .so version,
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
-version=1.18.2
+version=1.18.3
 revision=1
 wrksrc="krb5-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://web.mit.edu/kerberos"
 distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz"
-checksum=c6e4c9ec1a98141c3f5d66ddf1a135549050c9fab4e9a4620ee9b22085873ae0
+checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719
 
 post_patch() {
 	vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in

From a7c7cc6f0a638160da8e34c20891cfa2b636da63 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:26:13 +0100
Subject: [PATCH 0384/3595] nnn: update to 3.5.

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

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

From 466ab9b71c26c3d724b54c555bdcc1a1bd8a88dc Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 20 Nov 2020 16:44:53 +0100
Subject: [PATCH 0385/3595] chroma: update to 0.8.2.

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

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 88642c709bf..8215a0ac027 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=go
 go_import_path="github.com/alecthomas/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=8d2981e4d0f223f1ab6e5308940308ca9d8bf6d06660a19a2345cfe133f9e17e
+checksum=b7b9bd2ff49a18127dd00cee0d8e1d262b861b0641f711cbf9c615431f2b9499
 
 do_check() {
 	go test -v

From 4d98714cc735cd834aa247d28f96e439a7ce1bff Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 20 Nov 2020 20:05:53 +0600
Subject: [PATCH 0386/3595] Komikku: update to 0.23.0.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index c2be0f5173f..a0f5e00ec7d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.22.1
+version=0.23.0
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -15,4 +15,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=c09726b0bf7f51412e98b193389d8de9554ec807916c99c170cda3b9e362fc6c
+checksum=a37d91a23ae6ddbff0784557d74b0c502b31c3504b673f248456786502c7ab4f

From e95157495e420e74493118a96e5d202000a6fec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 20 Nov 2020 16:23:29 +0100
Subject: [PATCH 0387/3595] bombadillo: update to 2.3.3.

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

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 721fae09f54..0214af5131d 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,6 +1,6 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
-version=2.3.1
+version=2.3.3
 revision=1
 wrksrc=${pkgname}
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://bombadillo.colorfield.space/"
 distfiles="https://tildegit.org/sloum/${pkgname}/archive/${version}.tar.gz"
-checksum=e8076493e924bd5860d3e17884b0675ea514eea75e7b4e96da1c79ab9805731f
+checksum=2d4ec15cac6d3324f13a4039cca86fecf3141503f556a6fa48bdbafb86325f1c
 
 post_install() {
 	vman bombadillo.1

From c12b1529b81058eefd575ed463c585148e561b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 20 Nov 2020 16:27:25 +0100
Subject: [PATCH 0388/3595] nudoku: update to 2.1.0.

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

diff --git a/srcpkgs/nudoku/template b/srcpkgs/nudoku/template
index ab21861d5a6..7c4eea77c29 100644
--- a/srcpkgs/nudoku/template
+++ b/srcpkgs/nudoku/template
@@ -1,6 +1,6 @@
 # Template file for 'nudoku'
 pkgname=nudoku
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config tar xz gettext gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jubalh/nudoku"
 distfiles="https://github.com/jubalh/${pkgname}/archive/${version}.tar.gz"
-checksum=44d3ec1ff34a010910ac7a92f6d84e8a7a4678a966999b7be27d224609ae54e1
+checksum=eeff7f3adea5bfe7b88bf7683d68e9a597aabd1442d1621f21760c746400b924
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" --disable-nls"

From e9f2ee96eb68bd82613b7af462a17c1b9deb976c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 20 Nov 2020 22:23:59 +0100
Subject: [PATCH 0389/3595] verilator: update to 4.104.

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

diff --git a/srcpkgs/verilator/template b/srcpkgs/verilator/template
index 74b448a5519..dc61d2c8326 100644
--- a/srcpkgs/verilator/template
+++ b/srcpkgs/verilator/template
@@ -1,6 +1,6 @@
 # Template file for 'verilator'
 pkgname=verilator
-version=4.102
+version=4.104
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf flex"
@@ -10,7 +10,7 @@ maintainer="Sasha Krassovsky <krassovskysasha@gmail.com>"
 license="LGPL-3.0-only"
 homepage="https://veripool.org/wiki/verilator"
 distfiles="https://github.com/verilator/verilator/archive/v${version}.tar.gz"
-checksum="4e4f4aff00af9a15a61c94b67ed070cd6312ddcc0f0d340a6df2199480064cef"
+checksum=6d42fa468234461e4a0c3154d5602cdded7b22d57f14be92c27a65d418a4a010
 
 pre_configure() {
 	autoconf

From 1c5cb9e3c38534d83c4dad943cc8daafa15f4af1 Mon Sep 17 00:00:00 2001
From: Ronald Leppink <ronaldleppink@gmail.com>
Date: Sat, 21 Nov 2020 12:05:41 +0100
Subject: [PATCH 0390/3595] telegram-desktop: update to 2.4.7.

Also update license
---
 .../telegram-desktop/patches/0001-musl.patch  | 50 ++++++++++---------
 srcpkgs/telegram-desktop/template             |  6 +--
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch
index 5746a911ab9..35b7c90b955 100644
--- a/srcpkgs/telegram-desktop/patches/0001-musl.patch
+++ b/srcpkgs/telegram-desktop/patches/0001-musl.patch
@@ -1,48 +1,50 @@
---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2020-06-03 09:28:30.000000000 +0200
-+++ -	2020-06-08 00:40:30.503197310 +0200
-@@ -13,7 +13,6 @@
- #include <QtCore/QVersionNumber>
+--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2020-11-21 11:09:51.647955733 +0100
++++ -	2020-11-21 11:09:50.935306092 +0100
+@@ -12,11 +12,6 @@
  #include <QtCore/QDate>
  #include <QtGui/QGuiApplication>
--#include <gnu/libc-version.h>
  
+-// this file is used on both Linux & BSD
+-#ifdef Q_OS_LINUX
+-#include <gnu/libc-version.h>
+-#endif // Q_OS_LINUX
+-
  namespace Platform {
  namespace {
-@@ -84,8 +74,7 @@
- 	return "Linux "
- 		+ (list.isEmpty() ? QString() : list[0] + ' ')
- 		+ (IsWayland() ? "Wayland " : "X11 ")
--		+ "glibc "
--		+ GetGlibCVersion();
-+		+ "void ";
- }
  
- QString SystemCountry() {
-@@ -103,11 +92,7 @@
- QDate WhenSystemBecomesOutdated() {
+@@ -95,11 +90,7 @@
+ 
  	if (IsLinux32Bit()) {
  		return QDate(2020, 9, 1);
--	} else if (const auto version = GetGlibCVersion(); !version.isEmpty()) {
--		if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) {
+-	} else if (libcName == qstr("glibc") && !libcVersion.isEmpty()) {
+-		if (QVersionNumber::fromString(libcVersion) < QVersionNumber(2, 23)) {
 -			return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
 -		}
 -	}
 +	} 
+ 
  	return QDate();
  }
+@@ -123,22 +114,10 @@
+ }
  
-@@ -129,14 +114,6 @@
- 	}
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
+-	return "glibc";
+-#endif // Q_OS_LINUX
+-
+ 	return QString();
  }
  
--QString GetGlibCVersion() {
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
 -	static const auto result = [&] {
 -		const auto version = QString::fromLatin1(gnu_get_libc_version());
 -		return QVersionNumber::fromString(version).isNull() ? QString() : version;
 -	}();
 -	return result;
--}
+-#endif // Q_OS_LINUX
 -
- bool IsWayland() {
- 	return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
+ 	return QString();
  }
+ 
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index cd685fdb7e3..dbadaded1fb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.4.3
+version=2.4.7
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -21,11 +21,11 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
 depends="qt5-imageformats qt5-core>=5.15.1<5.15.2"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later WITH OpenSSL"
+license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=56de48ea5332b3e113423e286f42a7b06e3059cadfed862c3164384ebebd4895
+checksum=7b13df53be5d6b58d07d730c9429e415be2fea7f7be37bcaa80a505152125bc8
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 6a890e03630742aa64fc95895e3916f7999e32e2 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 6 Nov 2020 11:40:22 +0100
Subject: [PATCH 0391/3595] vscode: update to 1.51.1. [ci skip]

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 96a0c349229..8c72a514d5b 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,9 +1,9 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.50.1
+version=1.51.1
 revision=1
 _electronver=9.3.1
-hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
+hostmakedepends="pkg-config python nodejs yarn tar git"
 makedepends="libxkbfile-devel libsecret-devel electron9"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
 short_desc="Microsoft Code for Linux"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7d874637055e2425fe981f387165b7c7949db0821b1135f9cd7ccd5c70903af7
+checksum=3a7127983fac7c8e44b5b26b026341b8fd91c65ff34a4664e65ae43ae358d31b
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 3750d210286f0ead250ceb776e67afacdd6a0e07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:34:58 +0100
Subject: [PATCH 0392/3595] libimagequant: update to 2.13.1.

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

diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 871191c6ecd..e6fe4f23ca9 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
 # Template file for 'libimagequant'
 pkgname=libimagequant
-version=2.13.0
+version=2.13.1
 revision=1
 build_style=configure
 configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/lib/"
 distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=1dcd874f97758472d5282ea1241f50959a6e643b8b5ad07dad100b7a85633efd
+checksum=1f46deec3fa280335cf7f0be3ede6006bb420ba8159a03d1f6938e8d283d03ae
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) configure_args+=" --enable-sse";;

From 8596be4772059b321d43bebf31eea24ec5d4244e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:35:12 +0100
Subject: [PATCH 0393/3595] pngquant: update to 2.13.1.

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

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 669eab71859..382eeecf7a9 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.13.0
+version=2.13.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-openmp"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
 distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=aebf96914dcce978f23da5ce3542f4ef30e635e24e386f2e5673a3d7215c646a
+checksum=2d462ca5739ac0afe5a6851914a48ff9d06d4fbd3c4883e8308de5dcc6d444bc
 make_check_target=test
 
 case "$XBPS_TARGET_MACHINE" in

From e061f91eb2751e910b41ea205b45f857e491f84e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 23 Nov 2020 11:36:25 +0100
Subject: [PATCH 0394/3595] parallel: update to 20201122.

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

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index e9b4ae98749..0b4348ed34f 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20201022
+version=20201122
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=35fe29864af62b5331affb84d8be683d52a7bf5fd3532fe0b6a4207a481af061
+checksum=4da0bf42c466493b44dcbd8750e7bf99c31da4c701e8be272276c16ec4caff30
 
 pre_configure() {
 	# no html and pdf doc

From c68c99343d5a261a886750d1e231f86adddcab01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 23 Nov 2020 11:38:58 +0100
Subject: [PATCH 0395/3595] ccache: update to 4.1

---
 ...uild-and-install-man-page-by-default.patch | 32 -------------------
 srcpkgs/ccache/template                       | 13 ++------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch

diff --git a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch b/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
deleted file mode 100644
index 1a1456c86d9..00000000000
--- a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-upstream: yes
-
-From 294ff2face26448afa68e3ef7b68bf4898d6dc77 Mon Sep 17 00:00:00 2001
-From: Erik Flodin <erik@ejohansson.se>
-Date: Fri, 30 Oct 2020 10:23:08 +0100
-Subject: [PATCH] Build and install man page by default (#705)
-
-Fixes #684.
----
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index fb0f316..b5c9f24 100644
---- doc/CMakeLists.txt
-+++ doc/CMakeLists.txt
-@@ -58,7 +58,11 @@ else()
-       COMMAND ${A2X_EXE} --doctype manpage --format manpage MANUAL.xml
-       MAIN_DEPENDENCY MANUAL.xml
-     )
--    add_custom_target(doc-man-page DEPENDS ccache.1)
-+    add_custom_target(doc-man-page ALL DEPENDS ccache.1)
-+    install(
-+      FILES "${CMAKE_CURRENT_BINARY_DIR}/ccache.1"
-+      DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-+    )
-     set(doc_files "${doc_files}" ccache.1)
-   endif()
- 
--- 
-2.29.2
-
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 7cf3ca186b7..d745cb36cc8 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,7 +1,7 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.0
-revision=2
+version=4.1
+revision=1
 bootstrap=yes
 build_style=cmake
 configure_args="-DENABLE_TESTING=OFF"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
 
 if [ -z "$CHROOT_READY" ]; then
 	hostmakedepends="cmake-bootstrap"
@@ -26,15 +26,8 @@ fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-post_build() {
-	if [ "$CHROOT_READY" ]; then
-		mv build/doc/Ccache.1 build/doc/ccache.1
-	fi
-}
-
 post_install() {
 	vmkdir usr/lib/ccache/bin
 	# clang

From 61cad1e23fba3487537e3bb8a0f3f980349ac9fd Mon Sep 17 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, 23 Nov 2020 17:54:17 +0700
Subject: [PATCH 0396/3595] numix-themes: build with sassc

- fix ftbfs on i686
- remove noarch
---
 srcpkgs/numix-themes/patches/sassc.patch | 57 ++++++++++++++++++++++++
 srcpkgs/numix-themes/template            | 21 +++------
 2 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/numix-themes/patches/sassc.patch

diff --git a/srcpkgs/numix-themes/patches/sassc.patch b/srcpkgs/numix-themes/patches/sassc.patch
new file mode 100644
index 00000000000..9546e272de4
--- /dev/null
+++ b/srcpkgs/numix-themes/patches/sassc.patch
@@ -0,0 +1,57 @@
+From b950d9f66cf6f901729025c5e63aa02b4d209d41 Mon Sep 17 00:00:00 2001
+From: KTB <ktb83@users.noreply.github.com>
+Date: Fri, 15 Nov 2019 08:13:13 -0500
+Subject: [PATCH] Updates Makefile to replace Ruby Sass with SassC
+
+This commit replaces the use of the Ruby Sass scss command with SassC's sassc command. Due to the more limited functionality of sassc, output directories must be created prior to running the command and only one file may be processed at a time unlike the many-to-many mode functionality of the scss command.
+---
+ Makefile | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d2735a91..c580a2a7 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-SASS=scss
+-SASSFLAGS=--sourcemap=none
++SASS=sassc
++SASSFLAGS=-M -t expanded
+ GLIB_COMPILE_RESOURCES=glib-compile-resources
+ RES_DIR=src/gtk-3.0
+ SCSS_DIR=$(RES_DIR)/scss
+@@ -14,8 +14,12 @@ UTILS=scripts/utils.sh
+ all: clean gresource
+ 
+ css:
+-	$(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR)
+-	$(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320)
++	mkdir $(DIST_DIR)
++	$(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk.scss $(DIST_DIR)/gtk.css
++	$(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk-dark.scss $(DIST_DIR)/gtk-dark.css
++	mkdir $(DIST_DIR320)
++	$(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk.scss $(DIST_DIR320)/gtk.css
++	$(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk-dark.scss $(DIST_DIR320)/gtk-dark.css
+ 
+ gresource: css
+ 	$(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml
+From 6ba019fae4b8c90ed721dfe2dad279752f454968 Mon Sep 17 00:00:00 2001
+From: KTB <ktb83@users.noreply.github.com>
+Date: Fri, 15 Nov 2019 08:19:32 -0500
+Subject: [PATCH] Makes import directive relative in _gnome-terminal.scss
+
+This commit changes the "widgets/button" import directive to be relative in the gtk-3.20 _gnome-terminal.scss file which is necessary when using SassC.
+---
+ src/gtk-3.20/scss/apps/_gnome-terminal.scss | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gtk-3.20/scss/apps/_gnome-terminal.scss b/src/gtk-3.20/scss/apps/_gnome-terminal.scss
+index fd3af1c5..704faf5d 100644
+--- a/src/gtk-3.20/scss/apps/_gnome-terminal.scss
++++ b/src/gtk-3.20/scss/apps/_gnome-terminal.scss
+@@ -1,4 +1,4 @@
+-@import "widgets/button";
++@import "../widgets/button";
+ 
+ /**********************
+  ! Genome Terminal *
diff --git a/srcpkgs/numix-themes/template b/srcpkgs/numix-themes/template
index f993b7949a4..0e5b7b436c7 100644
--- a/srcpkgs/numix-themes/template
+++ b/srcpkgs/numix-themes/template
@@ -1,22 +1,15 @@
+# Template file for 'numix-themes'
 pkgname=numix-themes
 version=2.6.7
-revision=1
+revision=2
 wrksrc="numix-gtk-theme-${version}"
-archs=noarch
 build_style=gnu-makefile
-short_desc="A modern flat theme with a combination of light and dark elements"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-3"
+hostmakedepends="glib-devel gdk-pixbuf sassc"
 depends="gtk+3 gtk-engine-murrine"
-hostmakedepends="glib-devel gdk-pixbuf-devel ruby-devel"
+short_desc="Modern flat theme with a combination of light and dark elements"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-3.0-or-later"
 homepage="https://github.com/numixproject/numix-gtk-theme"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=2b997ad3eee0b802d0dd49dd772127fd3c337cca32d8863efd4897928e38879a
-
-pre_build() {
-	gem install sass
-}
-
-post_install() {
-	vlicense LICENSE
-}
+patch_args=-Np1

From 5083c3ca012673b0da1683930620bc477182633b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 0397/3595] kadu: remove noarch

---
 srcpkgs/kadu-data     |  1 -
 srcpkgs/kadu/template | 21 +++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/kadu-data

diff --git a/srcpkgs/kadu-data b/srcpkgs/kadu-data
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-data
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
index da8c8c086ff..8587198ae71 100644
--- a/srcpkgs/kadu/template
+++ b/srcpkgs/kadu/template
@@ -1,7 +1,7 @@
 # Template file for 'kadu'
 pkgname=kadu
 version=4.3
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
  -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -19,7 +19,7 @@ makedepends="libao-devel libsndfile-devel libarchive-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
  libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
  libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl
+depends="hicolor-icon-theme qca-qt5-ossl
  $(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
  $(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
  $(vopt_if tds qt5-plugin-tds)"
@@ -29,6 +29,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://sourceforge.net/projects/kadu/"
 distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
 checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
+replaces="kadu-data>=0"
 
 build_options="mysql odbc pgsql sqlite tds"
 build_options_default="sqlite"
@@ -53,22 +54,6 @@ pre_configure() {
 		-e "s;word_fix$;;"
 }
 
-kadu-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/icons
-		vmove "usr/share/kadu/configuration/*.ui"
-		vmove usr/share/kadu/themes
-		vmove usr/share/kadu/scripts
-		vmove usr/share/kadu/syntax
-		vmove "usr/share/kadu/plugins/*.desc"
-		vmove "usr/share/kadu/plugins/configuration/*.ui"
-		vmove usr/share/kadu/translations
-		vmove usr/share/kadu/plugins/data
-		vmove usr/share/kadu/plugins/translations
-	}
-}
 kadu-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 54bad8395ed88450e4a23afd9a3816d6ab11d338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 0398/3595] kobodeluxe: remove noarch

---
 srcpkgs/kobodeluxe-data     |  1 -
 srcpkgs/kobodeluxe/template | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/kobodeluxe-data

diff --git a/srcpkgs/kobodeluxe-data b/srcpkgs/kobodeluxe-data
deleted file mode 120000
index a6b8725b11b..00000000000
--- a/srcpkgs/kobodeluxe-data
+++ /dev/null
@@ -1 +0,0 @@
-kobodeluxe
\ No newline at end of file
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 60539b09390..3de0311b8e5 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -1,19 +1,19 @@
 # Template file for 'kobodeluxe'
 pkgname=kobodeluxe
 version=0.5.1
-revision=2
+revision=3
 wrksrc="KoboDeluxe-${version}"
 build_style=gnu-configure
 configure_args="--sharedstatedir=/var/games"
 hostmakedepends="pkg-config"
 makedepends="SDL_image-devel"
-depends="${pkgname}-data"
 short_desc="Space shooter in 2D"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://olofson.net/kobodl"
 distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
 checksum=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
+replaces="kobodeluxe-data>=0"
 
 post_extract() {
 	bsdtar xf icons.tar.gz
@@ -26,11 +26,3 @@ post_install() {
 	done
 	vinstall icons/KDE/icons/32x32/kobodl.png 644 usr/share/pixmaps
 }
-
-kobodeluxe-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/kobo-deluxe
-	}
-}

From 3a18948617cb10b184da43888c53e347128ad98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 0399/3595] kpcli: remove noarch

---
 srcpkgs/kpcli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/kpcli/template b/srcpkgs/kpcli/template
index 3201920ce88..193c227462e 100644
--- a/srcpkgs/kpcli/template
+++ b/srcpkgs/kpcli/template
@@ -1,8 +1,7 @@
 # Template file for 'kpcli'
 pkgname=kpcli
 version=3.3
-revision=1
-archs=noarch
+revision=2
 build_style=fetch
 depends="perl perl-Crypt-Rijndael perl-Sort-Naturally perl-Term-ReadKey perl-Term-ShellUI perl-File-KeePass perl-Clone perl-Term-ReadLine-Gnu perl-XML-Parser"
 short_desc="KeePass Command Line Interface"

From 291420cc5f7cec4479cbc4c02226919a43a14fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 0400/3595] kupfer: remove noarch

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

diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 03e80e9fdc9..f66ed5c37ee 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,14 +1,13 @@
 # Template file for 'kupfer'
 pkgname=kupfer
 version=319
-revision=2
-archs=noarch
-build_style=waf3
+revision=3
 wrksrc="${pkgname}-v${version}"
-python_version=3
+build_style=waf3
 pycompile_dirs="usr/share/kupfer/kupfer"
 configure_args="--no-update-mime --no-update-icon-cache"
-hostmakedepends="intltool python3-docutils"
+hostmakedepends="intltool python3-docutils python3-gobject python3-xdg
+ python3-dbus gtk+3"
 makedepends="libkeybinder3 libwnck python3-gobject python3-xdg python3-dbus"
 depends="$makedepends"
 short_desc="Interface for quick and convenient access to applications"
@@ -17,3 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://kupferlauncher.github.io/"
 distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"
 checksum=22357233984a6588a9f9743002363af38ea63b5c2684af487693a13c42973d31
+python_version=3

From 9b241c107562de57afacd28777fab5310d3bf94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 0401/3595] neofetch: remove noarch

---
 srcpkgs/neofetch/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template
index 60862481a28..1529e9ceef6 100644
--- a/srcpkgs/neofetch/template
+++ b/srcpkgs/neofetch/template
@@ -1,8 +1,7 @@
 # Template file for 'neofetch'
 pkgname=neofetch
 version=7.1.0
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-makefile
 depends="bash"
 short_desc="Simple system information script"

From 446d8bc21557b6806dc943e55a4f5881c1364a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 0402/3595] netbsd-wtf: remove noarch

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

diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index 87708e08847..be1b0c28c5c 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -1,13 +1,12 @@
 # Template file for 'netbsd-wtf'
 pkgname=netbsd-wtf
 version=20180621
-revision=2
+revision=3
 _commit=b1e5be48e340146f63b174cc14fef892a783168b
-archs=noarch
 build_style=gnu-makefile
-short_desc="The NetBSD's wtf(6) utility"
+short_desc="NetBSD's wtf(6) utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
 homepage="https://www.netbsd.org"
 distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz"
 checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7

From 2aa5134fe396196564ffcf10190f51c6531f55a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 0403/3595] netdata: remove noarch

---
 srcpkgs/netdata/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 205d7985614..f6386f3e519 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,7 +1,7 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.24.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
@@ -53,7 +53,6 @@ post_install() {
 netdata-plugins-nodejs_package() {
 	short_desc+=" - NodeJS Plugins"
 	depends="${sourcepkg}>=${version}_${revision} virtual?nodejs-runtime"
-	archs=noarch
 	pkg_install() {
 		vmove usr/libexec/netdata/plugins.d/node.d.plugin
 		vmove usr/libexec/netdata/node.d
@@ -63,7 +62,6 @@ netdata-plugins-nodejs_package() {
 netdata-plugins-python_package() {
 	short_desc+=" - Python Plugins"
 	depends="${sourcepkg}>=${version}_${revision} python3"
-	archs=noarch
 	pkg_install() {
 		vmove usr/libexec/netdata/plugins.d/python.d.plugin
 		vmove usr/libexec/netdata/python.d

From a17ef47a02229ec162aacab95ce89a82336edb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 0404/3595] netsurf-buildsystem: remove noarch

---
 srcpkgs/netsurf-buildsystem/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index b65615497e2..9bb7863b9c6 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,8 +1,7 @@
 # Template file for 'netsurf-buildsystem'
 pkgname=netsurf-buildsystem
 version=1.9
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#netsurf-}-${version}"
 short_desc="Netsurf buildsystem"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2ae26ee08ffdf264ade88e4229406573b20aa0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 0405/3595] novaboot: remove noarch

---
 srcpkgs/novaboot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/novaboot/template b/srcpkgs/novaboot/template
index f93c1ebe23b..78372f9230f 100644
--- a/srcpkgs/novaboot/template
+++ b/srcpkgs/novaboot/template
@@ -1,8 +1,7 @@
 # Template file for 'novaboot'
 pkgname=novaboot
 version=20191023
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl"
 makedepends="perl"

From e63f873866f5a20dc08154f981f6881d47f88caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 0406/3595] ntp: remove noarch

---
 srcpkgs/ntp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index c1cd814ea9d..a2cc0f62441 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
@@ -42,7 +42,6 @@ post_install() {
 
 ntp-perl_package() {
 	depends="ntp>=$version perl"
-	archs=noarch
 	short_desc+=" - perl scripts"
 	pkg_install() {
 		vmove usr/bin/ntp-wait

From 9d7b419b961ee943e9d5e6806207e651f30a7bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 0407/3595] num-utils: remove noarch

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

diff --git a/srcpkgs/num-utils/template b/srcpkgs/num-utils/template
index d7b542fa7af..a0103d6e4a6 100644
--- a/srcpkgs/num-utils/template
+++ b/srcpkgs/num-utils/template
@@ -1,16 +1,15 @@
 # Template file for 'num-utils'
 pkgname=num-utils
 version=0.5
-revision=1
+revision=2
 hostmakedepends="perl"
 depends="perl"
 short_desc="Programs for dealing with numbers from the Unix command line"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://suso.suso.org/xulu/Num-utils"
 distfiles="http://suso.suso.org/programs/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=03592760fc7844492163b14ddc9bb4e4d6526e17b468b5317b4a702ea7f6c64e
-archs=noarch
 
 post_extract() {
 	sed -i 's/\$new_number\^\$1/$new_number**$1/g' numprocess

From d346601a7377c4a89be69095b16a629b3669996b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:52 +0700
Subject: [PATCH 0408/3595] sbt: remove noarch

---
 srcpkgs/sbt/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index df79423b267..6847c2efefe 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,8 +1,7 @@
 # Template file for 'sbt'
 pkgname=sbt
 version=1.3.10
-revision=1
-archs=noarch
+revision=2
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"

From 0f4cd5865db90fb93b0c7bb611ca8c1b79be9c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:52 +0700
Subject: [PATCH 0409/3595] scanmem: remove noarch

---
 srcpkgs/scanmem/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template
index b9bbb2f89fc..d694f33d372 100644
--- a/srcpkgs/scanmem/template
+++ b/srcpkgs/scanmem/template
@@ -1,7 +1,7 @@
 # Template file for 'scanmem'
 pkgname=scanmem
 version=0.17
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-gui"
 hostmakedepends="automake gettext-devel intltool libtool m4 python"
@@ -41,7 +41,6 @@ libscanmem-devel_package() {
 gameconqueror_package() {
 	short_desc="GameConqueror is a GUI front-end for scanmem, providing more features"
 	depends="polkit gtk+3 python3-gobject lib${sourcepkg}>=${version}_${revision}"
-	archs=noarch
 	python_version=3
 	pkg_install() {
 		cd $DESTDIR

From 85177176b385991a5f09e34ef72276e403947630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 0410/3595] screenFetch: remove noarch

---
 srcpkgs/screenFetch/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/screenFetch/template b/srcpkgs/screenFetch/template
index 4a3d5a9dcaa..a9749569135 100644
--- a/srcpkgs/screenFetch/template
+++ b/srcpkgs/screenFetch/template
@@ -1,8 +1,7 @@
 # Template file for 'screenFetch'
 pkgname=screenFetch
 version=3.9.1
-revision=1
-archs=noarch
+revision=2
 depends="bash bc xdpyinfo"
 short_desc="Bash screenshot information tool"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ea6e8ff731eaecc781038b93e861cf4dd8072d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 0411/3595] sendEmail: remove noarch

---
 srcpkgs/sendEmail/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/sendEmail/template b/srcpkgs/sendEmail/template
index a60e0941572..be7d5425e0c 100644
--- a/srcpkgs/sendEmail/template
+++ b/srcpkgs/sendEmail/template
@@ -1,8 +1,7 @@
 # Template file for 'sendEmail'
 pkgname=sendEmail
 version=1.56
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname}-v${version}"
 depends="perl-Net-SSLeay"
 short_desc="Lightweight, command line SMTP email client"

From cd2cf51ff7e2ca5bdc1bda18678b14d6be76f900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 0412/3595] shorewall: remove noarch

---
 srcpkgs/shorewall/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 30efdba8869..932c9281c2b 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,8 +1,7 @@
 # Template file for 'shorewall'
 pkgname=shorewall
 version=5.2.7
-revision=1
-archs=noarch
+revision=2
 create_wrksrc=yes
 depends="shorewall-core perl"
 short_desc="Iptables-based firewall for Linux systems"
@@ -37,7 +36,6 @@ do_install() {
 }
 
 shorewall-core_package() {
-	archs=noarch
 	depends="iptables iproute2"
 	short_desc+=" - Core Shorewall files"
 	pkg_install() {
@@ -47,7 +45,6 @@ shorewall-core_package() {
 }
 
 shorewall6_package() {
-	archs=noarch
 	depends="shorewall"
 	conf_files="/etc/$pkgname/*"
 	short_desc+=" - IPv6 support"

From 70830d6bcbd2a6d56d9bec6452fe66df836e4250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 0413/3595] shunit2: remove noarch

---
 srcpkgs/shunit2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/shunit2/template b/srcpkgs/shunit2/template
index f909503b0f6..3b90bad7259 100644
--- a/srcpkgs/shunit2/template
+++ b/srcpkgs/shunit2/template
@@ -1,8 +1,7 @@
 # Template file for 'shunit2'
 pkgname=shunit2
 version=2.1.8
-revision=1
-archs=noarch
+revision=2
 depends="bash"
 checkdepends="zsh ksh"
 short_desc="Unit testing framework for Unix shell scripts based on xUnit"

From 102be7624ca9ea79ccc738776b05aa7891c955a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 0414/3595] signond: remove noarch

---
 srcpkgs/signond/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template
index fc1bdebe712..183c3b9481e 100644
--- a/srcpkgs/signond/template
+++ b/srcpkgs/signond/template
@@ -1,7 +1,7 @@
 # Template file for 'signond'
 pkgname=signond
 version=8.60
-revision=2
+revision=3
 wrksrc="signond-VERSION_${version}-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe"
 build_style=qmake
 configure_args="LIBDIR=/usr/lib"
@@ -25,7 +25,6 @@ pre_configure() {
 }
 
 signond-doc_package() {
-	archs=noarch
 	short_desc+=" - documentation"
 	pkg_install() {
 		vmove usr/share/doc

From d6ae277112999e3234064e915e3a74d505014a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:53 +0700
Subject: [PATCH 0415/3595] sigrok-firmware-fx2lafw: remove noarch

---
 srcpkgs/sigrok-firmware-fx2lafw/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/sigrok-firmware-fx2lafw/template b/srcpkgs/sigrok-firmware-fx2lafw/template
index 5c92bc1c0ac..3f767d70ef4 100644
--- a/srcpkgs/sigrok-firmware-fx2lafw/template
+++ b/srcpkgs/sigrok-firmware-fx2lafw/template
@@ -1,8 +1,7 @@
 # Template file for 'sigrok-firmware-fx2lafw'
 pkgname=sigrok-firmware-fx2lafw
 version=0.1.7
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname}-bin-${version}"
 short_desc="Sigrok fx2lafw Firmware files"
 maintainer="lemmi <lemmi@nerd2nerd.org>"

From 955e0eb9a6a1381a0675b5a65ab441ef6e967ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:54 +0700
Subject: [PATCH 0416/3595] snazzer: remove noarch

---
 srcpkgs/snazzer/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/snazzer/template b/srcpkgs/snazzer/template
index 40828a47362..df1451b6f2f 100644
--- a/srcpkgs/snazzer/template
+++ b/srcpkgs/snazzer/template
@@ -1,8 +1,7 @@
 # Template file for 'snazzer'
 pkgname=snazzer
 version=0.0.3
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pod2mdoc"
 depends="sudo btrfs-progs"

From dc082faa3b291095270ed6160f761f92488e04b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:54 +0700
Subject: [PATCH 0417/3595] soundconverter: remove noarch

---
 srcpkgs/soundconverter/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 1bda4743513..9e933929f97 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,8 +1,7 @@
 # Template file for 'soundconverter'
 pkgname=soundconverter
 version=3.0.2
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
 hostmakedepends="glib intltool pkg-config python3-gobject"

From b452b20a0ed87178c8dbacc0905271df885408ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0418/3595] speedometer: remove noarch

---
 srcpkgs/speedometer/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/speedometer/template b/srcpkgs/speedometer/template
index 3c287fcdca7..c0fe822bee9 100644
--- a/srcpkgs/speedometer/template
+++ b/srcpkgs/speedometer/template
@@ -1,8 +1,7 @@
 # Template file for 'speedometer'
 pkgname=speedometer
 version=2.8
-revision=3
-archs=noarch
+revision=4
 wrksrc="speedometer-release-${version}"
 depends="python-urwid"
 short_desc="Monitor network traffic or speed/progress of a file transfer"

From 61bd61e690724f136a71ec57358017a3e0d3e26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0419/3595] spice-protocol: remove noarch

---
 srcpkgs/spice-protocol/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template
index 819c2977712..f94ce7f8d7e 100644
--- a/srcpkgs/spice-protocol/template
+++ b/srcpkgs/spice-protocol/template
@@ -1,8 +1,7 @@
 # Template file for 'spice-protocol'
 pkgname=spice-protocol
 version=0.14.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="spice-protocol-v${version}"
 build_style=meson
 short_desc="SPICE protocol headers"

From 95f7b50342b0d28fece746bb455d368940232e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0420/3595] starfighter: remove noarch

---
 srcpkgs/starfighter-data     |  1 -
 srcpkgs/starfighter/template | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/starfighter-data

diff --git a/srcpkgs/starfighter-data b/srcpkgs/starfighter-data
deleted file mode 120000
index 8c24b109c9b..00000000000
--- a/srcpkgs/starfighter-data
+++ /dev/null
@@ -1 +0,0 @@
-starfighter
\ No newline at end of file
diff --git a/srcpkgs/starfighter/template b/srcpkgs/starfighter/template
index 1b357256b2f..0b13c857864 100644
--- a/srcpkgs/starfighter/template
+++ b/srcpkgs/starfighter/template
@@ -1,28 +1,21 @@
 # Template file for 'starfighter'
 pkgname=starfighter
 version=2.0.0.2
-revision=1
+revision=2
 _version="${version%.*.*}"
 build_style=gnu-configure
 configure_args="exec_prefix=/usr"
 hostmakedepends="pkg-config automake"
 makedepends="SDL2_image-devel SDL2_mixer-devel"
-depends="starfighter-data desktop-file-utils"
+depends="desktop-file-utils"
 short_desc="Side-scrolling shoot 'em up space game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://pr-starfighter.github.io"
 distfiles="https://github.com/pr-starfighter/starfighter/archive/v${version}.tar.gz"
 checksum=100562f2e12530ff4e360898ec5aace7f2c99806a9cba68d02466e82f8c1ae83
+replaces="starfighter-data>=0"
 
 pre_configure() {
 	autoreconf -fi
 }
-
-starfighter-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/starfighter
-	}
-}

From 9de09dc880576cfaf3f7df866a76a0fa2f4ecbbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0421/3595] startup: remove noarch

---
 srcpkgs/startup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/startup/template b/srcpkgs/startup/template
index 4a163d65afc..eeeee53501a 100644
--- a/srcpkgs/startup/template
+++ b/srcpkgs/startup/template
@@ -1,7 +1,7 @@
 # Template file for 'startup'
 pkgname=startup
 version=2.0.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-sysvcompat --disable-dconf-bridge --disable-cgroups"
 make_dirs="/var/log/startup 0750 root adm"
@@ -25,7 +25,6 @@ post_install() {
 }
 
 startup-tools_package() {
-	archs=noarch
 	depends="${sourcepkg}>=${version}_${revision} python3-dbus python3-gobject"
 	short_desc+=" - monitoring and analysis tools"
 	pkg_install() {

From 97b7ed6f39d82ca6e6d83de69ad9903cd754415f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0422/3595] statnot: remove noarch

---
 srcpkgs/statnot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/statnot/template b/srcpkgs/statnot/template
index e1817d8f43a..a634cb1eb2d 100644
--- a/srcpkgs/statnot/template
+++ b/srcpkgs/statnot/template
@@ -1,8 +1,7 @@
 # Template file for 'statnot'
 pkgname=statnot
 version=0.0.4
-revision=3
-archs=noarch
+revision=4
 build_style=gnu-makefile
 depends="pygtk python3-dbus xsetroot"
 short_desc="Notification system for lightweight window managers"

From be87ebbad73302bfa85937b11d4dfa6b5095ebab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0423/3595] stk: remove noarch

---
 srcpkgs/stk-data     |  1 -
 srcpkgs/stk/template | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/stk-data

diff --git a/srcpkgs/stk-data b/srcpkgs/stk-data
deleted file mode 120000
index e69eabc8478..00000000000
--- a/srcpkgs/stk-data
+++ /dev/null
@@ -1 +0,0 @@
-stk
\ No newline at end of file
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 8df159eb8a9..70ff45b42f6 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -1,18 +1,19 @@
 # Template file for 'stk'
 pkgname=stk
 version=4.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
 hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
-depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
+depends="libstk-${version}_${revision}"
 short_desc="Synthesis ToolKit in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="custom:MIT-like"
 homepage="https://ccrma.stanford.edu/software/stk/"
 distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281
+replaces="stk-data>=0"
 
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
@@ -64,14 +65,6 @@ post_install() {
 	vlicense LICENSE
 }
 
-stk-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/stk
-	}
-}
-
 stk-examples_package() {
 	short_desc+=" - examples"
 	depends="${sourcepkg}>=${version}_${revision}"

From ca896abc13da43419f02c2ddfd6fad50e61251d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:55 +0700
Subject: [PATCH 0424/3595] syncplay: remove noarch

---
 srcpkgs/syncplay/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template
index 83accc1983a..1c459b94d53 100644
--- a/srcpkgs/syncplay/template
+++ b/srcpkgs/syncplay/template
@@ -1,8 +1,7 @@
 # Template file for 'syncplay'
 pkgname=syncplay
 version=1.6.5
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-makefile
 pycompile_dirs="usr/lib/syncplay/syncplay"
 depends="desktop-file-utils python3-pyside2 python3-Twisted

From f1f96cb9d0d8fb7d6a886c954bbd4fa5fa57fed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:42:56 +0700
Subject: [PATCH 0425/3595] syncthing-gtk: remove noarch

---
 srcpkgs/syncthing-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index aaaa57a1c9e..90e9f21cf4a 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,8 +2,7 @@
 pkgname=syncthing-gtk
 reverts="0.14.36_1"
 version=0.9.4.4
-revision=2
-archs=noarch
+revision=3
 build_style=python2-module
 hostmakedepends="python-setuptools"
 depends="syncthing python-dateutil libnotify librsvg python-bcrypt

From a81a35beb73ad94c80dcf1d3d5cd185dc43b2c88 Mon Sep 17 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, 23 Nov 2020 19:00:58 +0700
Subject: [PATCH 0426/3595] Partial revert "stk: remove noarch"

This reverts commit b792c5f78cd9f768810987df2cb16dbb8b64e01f.
Some other packages depends on stk-data.
---
 srcpkgs/stk-data     |  1 +
 srcpkgs/stk/template | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/stk-data

diff --git a/srcpkgs/stk-data b/srcpkgs/stk-data
new file mode 120000
index 00000000000..e69eabc8478
--- /dev/null
+++ b/srcpkgs/stk-data
@@ -0,0 +1 @@
+stk
\ No newline at end of file
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 70ff45b42f6..f726e3a5340 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -6,14 +6,13 @@ build_style=gnu-configure
 configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
 hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
-depends="libstk-${version}_${revision}"
+depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
 short_desc="Synthesis ToolKit in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="custom:MIT-like"
 homepage="https://ccrma.stanford.edu/software/stk/"
 distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281
-replaces="stk-data>=0"
 
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
@@ -65,6 +64,13 @@ post_install() {
 	vlicense LICENSE
 }
 
+stk-data_package() {
+	short_desc+=" - data files"
+	pkg_install() {
+		vmove usr/share/stk
+	}
+}
+
 stk-examples_package() {
 	short_desc+=" - examples"
 	depends="${sourcepkg}>=${version}_${revision}"

From ce8134647e9298f4fe6faeaadb4d029211e3e942 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 Nov 2020 15:34:34 +0200
Subject: [PATCH 0427/3595] notcurses: update to 2.0.7.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index bb2d9419da8..388a1181abf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.0.4
+version=2.0.7
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON"
@@ -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=6bb38ca0affc6425cd8e248c5b81aa4281713362c45202a450a89ab751833c98
+checksum=cc87e66f9dc3e9d0e591de70870dec5d8b36e660f18f10adae7f45abb0f0320a
 
 notcurses-devel_package() {
 	depends="notcurses-${version}_${revision}"

From 872230e4fa13173f1a44d955d3b131f64d6f9166 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 Nov 2020 15:34:43 +0200
Subject: [PATCH 0428/3595] growlight: update to 1.2.20.

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 5ea4a3a42a8..3a45507e11c 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,7 +1,7 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.18
-revision=2
+version=1.2.21
+revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS)"
 hostmakedepends="pkg-config pandoc"
@@ -14,7 +14,11 @@ 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=c6c08556e6838226b81300e177c49d7a382e9eb30cfdb19f99790106e426a032
+checksum=a225266b98a7c438a04d79951b3a58834027fcc6174baa31e315265b2e7b1d30
+
+pre_configure() {
+	vsed -i 's#sbin#bin#' CMakeLists.txt
+}
 
 build_options="zfs"
 desc_option_zfs="Build with ZFS Support"

From 9b0cac598450f2a018d0669faf74bbb4d508720e Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 23 Nov 2020 11:19:48 +0100
Subject: [PATCH 0429/3595] gemget: update to 1.7.0

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

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index 985c497b821..ae91001d9d5 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,6 +1,6 @@
 # Template file for 'gemget'
 pkgname=gemget
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
@@ -9,7 +9,7 @@ maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://github.com/makeworld-the-better-one/gemget/"
 distfiles="https://github.com/makeworld-the-better-one/gemget/archive/v$version.tar.gz"
-checksum=2a435af153272c53e82508a1e294142c15259224e94294d15f09c8a0c6f10f7b
+checksum=271e89cf4bf76a78c6efffce4b307c24edae4a04147a3ec3aed2bf0289cc4e12
 
 post_install() {
 	vlicense LICENSE

From 54d5a5f16ddf7d05cbe3560b142e8cc7c741e28e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 14:06:41 +0200
Subject: [PATCH 0430/3595] FAudio: update to 20.11.

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

diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index 4605f7a5a00..b60a953b4ca 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,18 +1,18 @@
 # Template file for 'FAudio'
 pkgname=FAudio
-version=20.02
+version=20.11
 revision=1
 build_style=cmake
-configure_args="-DFFMPEG=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
+configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
  -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="SDL2-devel ffmpeg-devel"
+makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
 short_desc="Accuracy-focused XAudio reimplementation for open platforms"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="Zlib"
 homepage="https://github.com/FNA-XNA/FAudio"
 distfiles="https://github.com/FNA-XNA/FAudio/archive/${version}.tar.gz"
-checksum=103a6d278921ce757e5427133626f60ce4876b30d81186f78af35d9f1ca4ef16
+checksum=551f1573a98082973e8e2f0ef14be8f34299c9813d58387f9edd32142e6f913b
 
 # sdl2 cmake file appears to be broken for cross compilation
 CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/SDL2 "

From b1273661e2b1cabdfbae7337ca814f7026982e3b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 21:37:04 -0600
Subject: [PATCH 0431/3595] python3-fuse: update to 1.0.0

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

diff --git a/srcpkgs/python3-fuse/template b/srcpkgs/python3-fuse/template
index 6b39962f4e3..7147b39d7ae 100644
--- a/srcpkgs/python3-fuse/template
+++ b/srcpkgs/python3-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fuse'
 pkgname=python3-fuse
-version=0.3.1
-revision=6
+version=1.0.0
+revision=1
 wrksrc=python-fuse-$version
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/libfuse/python-fuse"
 distfiles="https://github.com/libfuse/python-fuse/archive/v${version}.tar.gz"
-checksum=243cfab15ee357dbcdac98c2ee5929f6e8c65d2ec9d77597e3732f79ce649eec
+checksum=caa90dd931128407df12b2c090200e49a67b9afb4176211aad03e2a19209a506

From e7fb06c105f43fb7287a6bf4c43817119062993b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 16:19:00 +0100
Subject: [PATCH 0432/3595] gzdoom: use bsdtar instead of ar

since ar p/x is prone to freezing at least on some musl targets,
just use equivalent bsdtar; the ar issue needs figuring out...
---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index bc644c1e3f2..8ee85e03174 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -30,7 +30,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_extract() {
-	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
+	bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
 	vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp

From 78083bce32c07f0265139107cdc482c913196b15 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 15:54:17 +0100
Subject: [PATCH 0433/3595] choosenim: fix build on ppc* and rebuild on other
 archs

See https://github.com/q66/cligen/commit/deee68fdc8ec5f34de7054a029739d3933fc551b
---
 srcpkgs/choosenim/patches/system-libarchive.patch | 2 +-
 srcpkgs/choosenim/template                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
index a102f0c13b3..97bbf2a62ba 100644
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -7,7 +7,7 @@ index 7ba9b36..dc47faa 100644
  
  requires "nim >= 1.2.6", "nimble#8f7af86"
 -requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
++requires "https://github.com/q66/nimterop#fcc79ac796e647998f5d6910ca9b7f951d40a8d1"
  #requires "libcurl >= 1.0.0" - OSX now uses httpclient
  requires "analytics >= 0.2.0"
  requires "osinfo >= 0.3.0"
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index fb5e9152b22..10cdb557589 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=1
+revision=2
 hostmakedepends="git nim libressl-devel pkg-config"
 makedepends="libressl-devel zlib-devel libarchive-devel"
 depends="gcc"

From e09447162d157f2e15e07d603ad26bb59178cbcf Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Nov 2020 16:28:12 +0100
Subject: [PATCH 0434/3595] choosenim: go back to upstream nimterop

upstream issued 1.3.1 hotfix version, which fixes this
---
 srcpkgs/choosenim/patches/system-libarchive.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
index 97bbf2a62ba..a102f0c13b3 100644
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@@ -7,7 +7,7 @@ index 7ba9b36..dc47faa 100644
  
  requires "nim >= 1.2.6", "nimble#8f7af86"
 -requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "https://github.com/q66/nimterop#fcc79ac796e647998f5d6910ca9b7f951d40a8d1"
++requires "nimterop >= 0.6.12"
  #requires "libcurl >= 1.0.0" - OSX now uses httpclient
  requires "analytics >= 0.2.0"
  requires "osinfo >= 0.3.0"

From 762aa989004051287e90f66510f526a7413ac3d3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 21:23:43 -0600
Subject: [PATCH 0435/3595] python3-httmock: update to 1.4.0

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

diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
index db9c09060ad..1ae09446ee7 100644
--- a/srcpkgs/python3-httmock/template
+++ b/srcpkgs/python3-httmock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httmock'
 pkgname=python3-httmock
-version=1.3.0
-revision=4
+version=1.4.0
+revision=1
 wrksrc="httmock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,8 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/patrys/httmock"
 distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
-checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
-
-do_check() {
-	python3 setup.py test
-}
+checksum=e1f094f555fe5e17c82c102dcd9093f3a041f5457f8ac75829c17f32db362bf1

From b67c4e5b1d6f92973033cf71110fa6713df38b56 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 10:28:39 -0500
Subject: [PATCH 0436/3595] python3-virtualenv: update to 20.2.1.

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

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 91775e9d370..3c607934257 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.2.0
+version=20.2.1
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ 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=fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3
+checksum=e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 826f363b86400f9c702f09ff55e5138ab230336a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 10:39:54 -0500
Subject: [PATCH 0437/3595] python3-wsproto: update to 1.0.0.

---
 srcpkgs/python3-wsproto/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-wsproto/template b/srcpkgs/python3-wsproto/template
index 6d2dab99f60..1da34b94340 100644
--- a/srcpkgs/python3-wsproto/template
+++ b/srcpkgs/python3-wsproto/template
@@ -1,17 +1,23 @@
 # Template file for 'python3-wsproto'
 pkgname=python3-wsproto
-version=0.15.0
-revision=4
+version=1.0.0
+revision=1
 wrksrc="wsproto-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3 python3-h11"
+depends="python3-h11"
+checkdepends="tox ${depends}"
 short_desc="Sans-IO WebSocket protocol implementation (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wsproto.readthedocs.io"
-distfiles="https://github.com/python-hyper/wsproto/archive/${version}.tar.gz"
-checksum=954e46ac07134d4f67832b17c14164e1771f106b078413e5fb8a2bd2738eb25c
+changelog="https://raw.githubusercontent.com/python-hyper/wsproto/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/w/wsproto/wsproto-${version}.tar.gz"
+checksum=868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38
+
+do_check() {
+	tox -e py${py3_ver/./}
+}
 
 post_install() {
 	vlicense LICENSE

From 2ddc90fa2f8ccb4b4dd97a6d0a680d37de6479ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 11:03:44 -0500
Subject: [PATCH 0438/3595] sshguard: update to 2.4.1.

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

diff --git a/srcpkgs/sshguard/template b/srcpkgs/sshguard/template
index 235a6129393..7fa96dbcaa9 100644
--- a/srcpkgs/sshguard/template
+++ b/srcpkgs/sshguard/template
@@ -1,7 +1,7 @@
 # Template file for 'sshguard'
 pkgname=sshguard
-version=2.4.0
-revision=2
+version=2.4.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="flex"
 short_desc="Protects networked hosts from brute force attacks"
@@ -9,7 +9,7 @@ maintainer="Lodvær <lodvaer@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.sshguard.net/"
 distfiles="${SOURCEFORGE_SITE}/sshguard/sshguard-${version}.tar.gz"
-checksum=065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0
+checksum=875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67
 
 make_dirs="/var/db/sshguard 0755 root root"
 conf_files="/etc/sshguard.conf"

From dce9241540c430bcfd407aff35890e2835c2eecf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 23 Nov 2020 11:14:05 -0500
Subject: [PATCH 0439/3595] unison: update to 2.51.3.

---
 srcpkgs/unison/patches/ocaml408.patch | 46 ---------------------------
 srcpkgs/unison/template               | 11 ++++---
 2 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/unison/patches/ocaml408.patch

diff --git a/srcpkgs/unison/patches/ocaml408.patch b/srcpkgs/unison/patches/ocaml408.patch
deleted file mode 100644
index 7c197454c64..00000000000
--- a/srcpkgs/unison/patches/ocaml408.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001
-From: Jaap Boender <jaapb@kerguelen.org>
-Date: Thu, 21 Mar 2019 12:26:51 +0000
-Subject: [PATCH] Compatibility with OCaml 4.08
-
----
- src/files.ml                 | 2 +-
- src/recon.ml                 | 4 ++--
- src/system/system_generic.ml | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- src/files.ml
-+++ src/files.ml
-@@ -734,7 +734,7 @@ let get_files_in_directory dir =
-   with End_of_file ->
-     dirh.System.closedir ()
-   end;
--  Sort.list (<) !files
-+  List.sort String.compare !files
- 
- let ls dir pattern =
-   Util.convertUnixErrorsToTransient
---- src/recon.ml
-+++ src/recon.ml
-@@ -662,8 +662,8 @@ let rec reconcile
- 
- (* Sorts the paths so that they will be displayed in order                   *)
- let sortPaths pathUpdatesList =
--  Sort.list
--    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+  List.sort
-+    Path.compare
-     pathUpdatesList
- 
- let rec enterPath p1 p2 t =
---- src/system/system_generic.ml
-+++ src/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
-   let h = Unix.opendir f in
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index a24b2cf3552..c3cb8e454c8 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,19 +1,20 @@
 # Template file for 'unison'
 pkgname="unison"
-version=2.51.2
-revision=6
+version=2.51.3
+revision=1
 hostmakedepends="ocaml"
 short_desc="A file-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
 license="GPL-3"
 homepage="http://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e
-nocross=yes
+checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
+nocross="OCaml does not cross compile"
 
 do_build() {
-	CFLAGS= make UISTYLE=text DEBUGGING=false THREADS=true
+	CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true
 }
+
 do_install() {
 	vbin src/unison
 	vbin src/unison-fsmonitor

From bfa42a9489dc02da4207dd8a1cfaaace0bee37cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 12 Nov 2020 18:55:44 +0100
Subject: [PATCH 0440/3595] electron9: update to 9.3.4.

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

diff --git a/srcpkgs/electron9/template b/srcpkgs/electron9/template
index 727f8ba95b2..d598cf62ff7 100644
--- a/srcpkgs/electron9/template
+++ b/srcpkgs/electron9/template
@@ -1,6 +1,6 @@
 # Template file for 'electron9'
 pkgname=electron9
-version=9.3.1
+version=9.3.4
 _nodever=12.14.1
 _chromiumver=83.0.4103.119
 revision=1
@@ -30,7 +30,7 @@ homepage="https://electronjs.org"
 distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
  https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
  https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="74292816dbccc1cc973d36f8bc101c31616b3c4c484056efb558a7a5e8fd1f60
+checksum="067399edbbadf7d975e293230ee716a441dc63bcc0bbf1ad41bd0e1063588867
  452cbc58895a46b2b87ba450a3f86897de92ad08ce28ffdbed6b3f12101d3788
  01e4a960be3e26b87c55509ee1cb44a14946a4169d5cdec046dd05058d995b26"
 

From 941428e2a24830243f17f47af661abd6a9958a12 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 23 Nov 2020 11:17:10 -0600
Subject: [PATCH 0441/3595] steam: update to 1.0.0.67.

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

diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 90a856864fb..6aeeb9471d7 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
 # Template file for 'steam'
 pkgname=steam
-version=1.0.0.66
+version=1.0.0.67
 revision=1
 archs="i686 x86_64"
 wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom: Proprietary license"
 homepage="https://steampowered.com/"
 distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=738c855f73168d0bce0b9297c75d9dbf56419b722264d8ca3f7737657754c710
+checksum=583c7791d67ac9e8539a16d29bd5055bb5f3823888fe92e07a869f1ffc4f925b
 repository=nonfree
 
 do_install() {

From cf3ffe821a9e42583323e9134a81e263a36a1e06 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 23 Nov 2020 11:20:06 -0600
Subject: [PATCH 0442/3595] nfdump: update to 1.6.22.

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

diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 31db7feb0d0..b2d73d25fed 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
 # Template file for 'nfdump'
 pkgname=nfdump
-version=1.6.21
+version=1.6.22
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/phaag/nfdump"
 distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=7ad5dd6a7c226865b5cafe317684e4c61ea95093f943fd46cd896977f234ca5c
+checksum=437536acb02258f8e2cd1e63c801428c65e1c33100e349acbf718c5b04734bd0
 configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
 
 pre_configure() {

From 3e75eae489289210d756b7800c2040853d5ebe4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 23 Nov 2020 11:27:08 -0300
Subject: [PATCH 0443/3595] rclone: fix segfault in musl cross targets.

For some reason, the cross built binaries have a TEXTREL in their
dynamic section, which musl's runtime linker doesn't support at all,
causing a segfault at launch. Fix this by disabling CGO_ENABLED for now.
---
 srcpkgs/rclone/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 3c7ea20e5bc..56b4353c1aa 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.53.3
-revision=1
+revision=2
 wrksrc="rclone-v${version}"
 build_style=go
 go_import_path=github.com/rclone/rclone
@@ -14,6 +14,15 @@ changelog="https://raw.githubusercontent.com/rclone/rclone/master/docs/content/c
 distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
 checksum=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
 
+pre_build() {
+	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# XXX: when cross building, the binary has a textrel, which segfaults when
+		# launched on musl
+		# FIXME: linkers for the musl toolchains should reject textrels entirely
+		export CGO_ENABLED=0
+	fi
+}
+
 post_install() {
 	vlicense COPYING
 	vman rclone.1

From 75ceba04dbdc499ec31fc757502b5dca13510506 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 19:28:27 +0200
Subject: [PATCH 0444/3595] libvterm: update to 0.1.4, change distfiles url.

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

diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index a6aa63f2277..54d9ad06321 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,6 +1,6 @@
 # Template file for 'libvterm'
 pkgname=libvterm
-version=0.1.3
+version=0.1.4
 revision=1
 build_style=gnu-makefile
 make_install_target="install-lib install-inc"
@@ -9,8 +9,8 @@ short_desc="Abstract VT220/xterm/ECMA-48 emulation library"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="http://www.leonerd.org.uk/code/libvterm"
-distfiles="https://launchpad.net/libvterm/trunk/v${version%.*}/+download/libvterm-${version}.tar.gz"
-checksum=e41724466a4658e0f095e8fc5aeae26026c0726dce98ee71d6920d06f7d78e2b
+distfiles="http://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"
+checksum=bc70349e95559c667672fc8c55b9527d9db9ada0fb80a3beda533418d782d3dd
 
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then

From ae306587b3cdb9de60bd01e72e33297dafbb3792 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 19:22:21 +0200
Subject: [PATCH 0445/3595] xonsh: update to 0.9.24.

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

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 1aaf2f5f96a..2ad7f65b91f 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,7 +1,7 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.9.22
-revision=2
+version=0.9.24
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 short_desc="Python-powered, cross-platform, Unix-gazing shell"
@@ -10,5 +10,5 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/${version}/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=ddef670edd172ea760bdff34dde082db9fa3057bb1b87a5694385295158449db
+checksum=ed981f129f2501b3d7354466b7c85ff58d22750f18df0910d66c8dbe94ec9b3b
 register_shell="/bin/xonsh"

From 5d80f2625e773c487182fe2cbca4b6a92fe3f5a2 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 23 Nov 2020 17:24:10 +0100
Subject: [PATCH 0446/3595] c-ares: update to 1.17.1.

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

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index e1849f9b3c0..9f81b95462c 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,22 +1,19 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.16.1
+version=1.17.1
 revision=1
 build_style=gnu-configure
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
-distfiles="https://c-ares.haxx.se/download/${pkgname}-${version}.tar.gz"
-checksum=d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce
+changelog="https://c-ares.haxx.se/changelog.html"
+distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
-	case "$CFLAGS" in
-	*"-D_FORTIFY_SOURCE=2"*)
-		export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
-		export CPPFLAGS+=" -D_FORTIFY_SOURCE=2"
-		;;
-	esac
+	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
+	export CPPFLAGS+=" -D_FORTIFY_SOURCE=2"
 	export CFLAGS=${CFLAGS/-I${XBPS_CROSS_BASE}\/usr\/include/}
 }
 

From c234a9281adc34703d8226b6975da07512ee4d85 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 12 Nov 2020 12:17:52 -0500
Subject: [PATCH 0447/3595] python3-occ: update to 7.4.1.

---
 srcpkgs/python3-occ/patches/occt.patch | 48 --------------------------
 srcpkgs/python3-occ/template           |  6 ++--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/python3-occ/patches/occt.patch

diff --git a/srcpkgs/python3-occ/patches/occt.patch b/srcpkgs/python3-occ/patches/occt.patch
deleted file mode 100644
index 1dc133471c7..00000000000
--- a/srcpkgs/python3-occ/patches/occt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Patch for occt-7.4.0p1. See disussion at
-https://github.com/tpaviot/pythonocc-core/issues/870
-
-Index: pythonocc-core-7.4.0/src/SWIG_files/wrapper/BOPAlgo.i
-===================================================================
---- src/SWIG_files/wrapper/BOPAlgo.i
-+++ src/SWIG_files/wrapper/BOPAlgo.i
-@@ -632,17 +632,6 @@ class BOPAlgo_Tools {
- 	:rtype: void") PerformCommonBlocks;
- 		static void PerformCommonBlocks (const BOPDS_IndexedDataMapOfPaveBlockListOfInteger & theMBlocks,const opencascade::handle<NCollection_BaseAllocator> & theAllocator,BOPDS_PDS & pDS,const opencascade::handle<IntTools_Context> & theContext = opencascade::handle<IntTools_Context>());
- 
--		/****************** TreatCompound ******************/
--		%feature("compactdefaultargs") TreatCompound;
--		%feature("autodoc", "* Collect in the output list recursively all non-compound subshapes of the first level of the given shape theS. If a shape presents in the map theMFence it is skipped. All shapes put in the output are also added into theMFence.
--	:param theS:
--	:type theS: TopoDS_Shape
--	:param theMFence:
--	:type theMFence: TopTools_MapOfShape
--	:param theLS:
--	:type theLS: TopTools_ListOfShape
--	:rtype: void") TreatCompound;
--		static void TreatCompound (const TopoDS_Shape & theS,TopTools_MapOfShape & theMFence,TopTools_ListOfShape & theLS);
- 
- 		/****************** WiresToFaces ******************/
- 		%feature("compactdefaultargs") WiresToFaces;
-Index: pythonocc-core-7.4.0/src/SWIG_files/wrapper/BOPTools.i
-===================================================================
---- src/SWIG_files/wrapper/BOPTools.i
-+++ src/SWIG_files/wrapper/BOPTools.i
-@@ -776,6 +776,18 @@ class BOPTools_AlgoTools {
- 	:rtype: int") Sense;
- 		static Standard_Integer Sense (const TopoDS_Face & theF1,const TopoDS_Face & theF2,const opencascade::handle<IntTools_Context> & theContext);
- 
-+		/****************** TreatCompound ******************/
-+		%feature("compactdefaultargs") TreatCompound;
-+		%feature("autodoc", "* Collect in the output list recursively all non-compound subshapes of the first level of the given shape theS. If a shape presents in the map theMFence it is skipped. All shapes put in the output are also added into theMFence.
-+	:param theS:
-+	:type theS: TopoDS_Shape
-+	:param theLS:
-+	:type theLS: TopTools_ListOfShape
-+	:param theMFence:
-+	:type theMFence: TopTools_MapOfShape
-+	:rtype: void") TreatCompound;
-+		static void TreatCompound (const TopoDS_Shape & theS,TopTools_ListOfShape & theLS, TopTools_MapOfShape * theMFence);
-+
- 		/****************** UpdateVertex ******************/
- 		%feature("compactdefaultargs") UpdateVertex;
- 		%feature("autodoc", "* @name Updating the vertex Update the tolerance value for vertex <aV> taking into account the fact that <aV> lays on the curve <aIC>
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 42d742ba0af..705f3745794 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
-version=7.4.0
-revision=2
+version=7.4.1
+revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="http://pythonocc.org"
 distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz"
-checksum=c53481e8b7387b7d3b5f717e86ef8a78849d5041e9cb2966dc6ed4210a3aceac
+checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667

From a41e71dace7fa1d75c4d345f82b793bab3d1e423 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 23 Nov 2020 21:52:00 +0100
Subject: [PATCH 0448/3595] rtkit: update to 0.13.

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

diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index 9eff8f84e99..b418f54cea7 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -1,24 +1,21 @@
 # Template file for 'rtkit'
 pkgname=rtkit
-version=0.11
-revision=16
+version=0.13
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel"
 short_desc="Realtime Policy and Watchdog Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later"
-homepage="http://git.0pointer.de/?p=rtkit.git"
-distfiles="http://0pointer.de/public/${pkgname}-${version}.tar.xz"
-checksum=68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0
+homepage="https://github.com/heftig/rtkit"
+distfiles="https://github.com/heftig/rtkit/releases/download/v${version}/rtkit-${version}.tar.xz"
+checksum=a157144cd95cf6d25200e74b74a8f01e4fe51fd421bb63c1f00d471394b640ab
 
 system_accounts="rtkit"
 rtkit_homedir="/proc"
 
 post_install() {
-	# DBus configuration
-	vinstall ${FILESDIR}/org.freedesktop.RealtimeKit1.xml 644 usr/share/dbus-1/interfaces
-
 	sed -n '7,28p' < rtkit.h > LICENSE
 	vlicense LICENSE
 	vsv rtkit

From 31ed41c06814127d00be43c48c72b25c3811ed9d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 23 Nov 2020 22:25:39 +0100
Subject: [PATCH 0449/3595] openradtool: update to 0.11.1.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index c6587dcc2c8..cfbfbc84557 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.11.0
+version=0.11.1
 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=e3b8ae50c789b8d3c875352bf8e7dd4f35a8f3ac400a6bcf738ecdf65f3f2f51
+checksum=90af8f7458880550acb90b1fca9918d5369339b54760ac9338d3b0691c7b9695
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 98a937e37ae6901b97f1032e4438fa86be57333a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 24 Nov 2020 01:38:40 +0100
Subject: [PATCH 0450/3595] axel: update to 2.17.10

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

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 3ddba3d3b4e..b934278782a 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,7 +1,7 @@
 # Template file for 'axel'
 pkgname=axel
-version=2.17.9
-revision=2
+version=2.17.10
+revision=1
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/axel-download-accelerator/axel"
 changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
 distfiles="https://github.com/axel-download-accelerator/axel/releases/download/v${version}/axel-${version}.tar.xz"
-checksum=f1364d9b55d435efc6d32218097a50a63be7b1300138e698133cf19ad3aa3a54
+checksum=46eb4f10a11c4e50320ae6a034ef03ffe59dc11c3c6542a9867a3e4dc0c4b44e
 
 post_install() {
 	vconf doc/axelrc.example axelrc

From 3ebdef94f017786f9e4da5d5c328542893831ac6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 03:36:09 +0100
Subject: [PATCH 0451/3595] choosenim: broken on ppc-musl

... /builddir/choosenim-0.7.4/nimarchive/nimarchive/archive.nim(36, 8) template/generic instantiation of `cImport` from here
... /usr/lib/nim/lib/system/fatal.nim(49, 5) Error: unhandled exception: cimport.nim(138, 16) `false`
... # Generated @ 2020-11-24T03:33:34+01:00
... # Command line:
... #   /tmp/.nimble/pkgs/nimterop-0.6.13/nimterop/toast --preprocess -m:c --pnim --symOverride=stat,dev_t,mode_t,archive_read_open_file,archive_write_open_file --nim:/usr/lib/nim/bin/nim --pluginSourcePath=/tmp/.cache/nim/nimterop/cPlugins/nimterop_1173585241.nim /builddir/choosenim-0.7.4/src/archive.h /builddir/choosenim-0.7.4/src/archive_entry.h -o /tmp/.cache/nim/nimterop/toastCache/nimterop_1397168449.nim
... Assertion failed: symbol < self->token_count (/tmp/.cache/nim/nimterop/nimterop/treesitter/lib/src/./language.c: ts_language_table_entry: 33)
---
 srcpkgs/choosenim/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 10cdb557589..d76f1a49bc7 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -14,6 +14,10 @@ distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
 checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
  c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc-musl) broken="ftbfs" ;;
+esac
+
 post_extract() {
 	mv ../nimarchive-0.5.4 nimarchive
 }

From a690c075b555f2e2049d5c6981468058ae5371de Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 03:52:46 +0100
Subject: [PATCH 0452/3595] growlight: optional pandoc

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 3a45507e11c..fc7ee81db70 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,10 +1,10 @@
 # Template file for 'growlight'
 pkgname=growlight
 version=1.2.21
-revision=1
+revision=2
 build_style=cmake
-configure_args="$(vopt_bool zfs USE_LIBZFS)"
-hostmakedepends="pkg-config pandoc"
+configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
+hostmakedepends="pkg-config $(vopt_if man pandoc)"
 makedepends="libatasmart-devel libblkid-devel libcap-devel cryptsetup-devel
  nettle-devel notcurses-devel libpciaccess-devel eudev-libudev-devel zlib-devel
  device-mapper-devel pciutils-devel $(vopt_if zfs zfs-devel)"
@@ -16,9 +16,15 @@ homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
 checksum=a225266b98a7c438a04d79951b3a58834027fcc6174baa31e315265b2e7b1d30
 
+build_options="man zfs"
+
+desc_option_man="Use pandoc for manpages"
+desc_option_zfs="Build with ZFS Support"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
+esac
+
 pre_configure() {
 	vsed -i 's#sbin#bin#' CMakeLists.txt
 }
-
-build_options="zfs"
-desc_option_zfs="Build with ZFS Support"

From 003c6aa7651c62664fac670332871eea18203897 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 03:55:49 +0100
Subject: [PATCH 0453/3595] notcurses: optional pandoc

---
 srcpkgs/notcurses/template | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 388a1181abf..9778aece641 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,10 +1,10 @@
 # Template file for 'notcurses'
 pkgname=notcurses
 version=2.0.7
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DUSE_STATIC=ON"
-hostmakedepends="pkg-config pandoc"
+configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
+hostmakedepends="pkg-config $(vopt_if man pandoc)"
 makedepends="libunistring-devel ffmpeg-devel ncurses-libtinfo-devel qrcodegen-devel doctest-devel"
 depends="ncurses-base"
 short_desc="Blingful character graphics/TUI library"
@@ -15,6 +15,13 @@ changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
 checksum=cc87e66f9dc3e9d0e591de70870dec5d8b36e660f18f10adae7f45abb0f0320a
 
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
+esac
+
 notcurses-devel_package() {
 	depends="notcurses-${version}_${revision}"
 	short_desc+=" - development files"
@@ -25,7 +32,9 @@ notcurses-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/share/doc
-		vmove usr/share/man/man3
+		if [ "$build_option_man" ]; then
+			vmove usr/share/man/man3
+		fi
 	}
 }
 
@@ -35,6 +44,8 @@ notcurses-progs_package() {
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/share/notcurses
-		vmove usr/share/man/man1
+		if [ "$build_option_man" ]; then
+			vmove usr/share/man/man1
+		fi
 	}
 }

From c711bb455ee4de81b46446dc1756176e33b22aa3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 04:15:05 +0100
Subject: [PATCH 0454/3595] pelican: pandoc checkdepends optional

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

diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index baa4f603c4f..2edd0e74024 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -7,8 +7,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-feedgenerator python3-Jinja2 python3-Pygments
  python3-docutils python3-pytz python3-blinker python3-Unidecode python3-six
  python3-dateutil"
-checkdepends="$depends pandoc git
- python3-lxml python3-BeautifulSoup4 python3-Markdown"
+checkdepends="$depends git python3-lxml python3-BeautifulSoup4 python3-Markdown"
 short_desc="Static site generator written in Python"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="AGPL-3.0-or-later"
@@ -21,6 +20,10 @@ changelog="https://raw.githubusercontent.com/getpelican/pelican/${version}/docs/
 distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
 checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
 
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) checkdepends+=" pandoc";;
+esac
+
 post_extract() {
 	# This test is problematic,
 	# but this test is not important, judging from its content

From db4b914aac605e0a6cf796e3ae04b5443c4fd5c1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 04:16:58 +0100
Subject: [PATCH 0455/3595] vimpager: optional pandoc

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

diff --git a/srcpkgs/vimpager/template b/srcpkgs/vimpager/template
index ef98b71a5ae..d6884b3f17d 100644
--- a/srcpkgs/vimpager/template
+++ b/srcpkgs/vimpager/template
@@ -1,9 +1,9 @@
 # Template file for 'vimpager'
 pkgname=vimpager
 version=2.06
-revision=2
+revision=3
 build_style=gnu-makefile
-hostmakedepends="sharutils pandoc tar"
+hostmakedepends="sharutils $(vopt_if man pandoc) tar"
 short_desc="Pager using vim and less.vim"
 maintainer="ivierlin <github@ivierlin.de>"
 license="BSD-3-Clause-Attribution"
@@ -11,6 +11,13 @@ homepage="https://github.com/rkitover/vimpager"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=cc616d0840a6f2501704eea70de222ab662421f34b2da307e11fb62aa70bda5d
 
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From 2a151ad406c95aaff94e247af2e106fb88bbe415 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 04:21:33 +0100
Subject: [PATCH 0456/3595] earlyoom: optional pandoc

---
 srcpkgs/earlyoom/template | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/earlyoom/template b/srcpkgs/earlyoom/template
index 338bc8896b3..5e9c5836bb1 100644
--- a/srcpkgs/earlyoom/template
+++ b/srcpkgs/earlyoom/template
@@ -1,10 +1,10 @@
 # Template file for 'earlyoom'
 pkgname=earlyoom
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_check_target=test
-hostmakedepends="pandoc"
+hostmakedepends="$(vopt_if man pandoc)"
 checkdepends="go"
 short_desc="Userspace Early OOM Daemon for Linux"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,9 +14,18 @@ distfiles="https://github.com/rfjakob/${pkgname}/archive/v${version}.tar.gz"
 checksum=227234cf9e77831c21c748bd361e1a7c415e158b96034eacd59e70586779bb6c
 CFLAGS="-DVERSION='\"${version}\"'"
 
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
+esac
+
 do_install() {
 	vbin earlyoom
-	vman earlyoom.1
+	if [ "$build_option_man" ]; then
+		vman earlyoom.1
+	fi
 	vsv earlyoom
 	vlicense LICENSE
 }

From 37a720014e30cdebe237721406996d22e982a90c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 04:25:46 +0100
Subject: [PATCH 0457/3595] nvimpager: optional pandoc

---
 srcpkgs/nvimpager/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvimpager/template b/srcpkgs/nvimpager/template
index d9203155ea4..ce957ff0a0f 100644
--- a/srcpkgs/nvimpager/template
+++ b/srcpkgs/nvimpager/template
@@ -1,7 +1,7 @@
 # Template file for 'nvimpager'
 pkgname=nvimpager
 version=0.7
-revision=1
+revision=2
 # In pre_build, date is the date of the last commit in the nvimpager repo.
 # It should be changed when updating to a new version.
 create_wrksrc=true
@@ -9,7 +9,7 @@ build_wrksrc="${pkgname}-${version}"
 build_style=gnu-makefile
 make_build_target="nvimpager.configured"
 make_build_args="PREFIX=/usr"
-hostmakedepends="neovim pandoc"
+hostmakedepends="neovim $(vopt_if man pandoc)"
 depends="neovim>=0.3.0 bash"
 short_desc="Wrapper to use neovim as a pager to view manpages, diffs, etc"
 maintainer="Adrian Herath <adrianisuru@gmail.com>"
@@ -20,6 +20,13 @@ distfiles="${homepage}/archive/v${version}.tar.gz
 checksum="cb4eee0ef2569412b0528eacd7efd6af960bebc11d8749258d8ba83c975ebf4b
  a80d8c95a2e497e190831f1b580205653c595c6f51b48d4cb89fb33eaea5ed03"
 
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
+esac
+
 pre_build() {
 	cat <<< \
 "---
@@ -29,8 +36,15 @@ date: 2020-09-25
 	> metadata.yml
 
 	mv ../AnsiEsc.vba ./
+
+	if [ -z "$build_option_man" ]; then
+		vsed -i 's,pandoc --.*,touch $@,' makefile
+	fi
 }
 
 post_install() {
 	vlicense LICENSE
+	if [ -z "$build_option_man" ]; then
+		rm -rf ${DESTDIR}/usr/share/man
+	fi
 }

From 2f4433f43db96e2cb21ffbdae53baaffb2bf1490 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 04:28:03 +0100
Subject: [PATCH 0458/3595] bird_exporter: optional pandoc

---
 srcpkgs/bird_exporter/template | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 4acdb5b704d..bed02e553cb 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,10 +1,10 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.2.5
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
-hostmakedepends="pandoc"
+hostmakedepends="$(vopt_if man pandoc)"
 depends="bird"
 short_desc="Metric exporter for BIRD routing daemon to use with Prometheus"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -13,11 +13,22 @@ homepage="https://github.com/czerwonk/bird_exporter"
 distfiles="https://github.com/czerwonk/bird_exporter/archive/${version}.tar.gz"
 checksum=3d8a1e718bc7f8bdd2c7fc775f042fdce81b4a2b08f978b0831f39909ac15c3d
 
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
+esac
+
 post_build() {
-	pandoc -s -t man bird_exporter.1.md -o bird_exporter.1
+	if [ "$build_option_man" ]; then
+		pandoc -s -t man bird_exporter.1.md -o bird_exporter.1
+	fi
 }
 post_install() {
-	vman bird_exporter.1
+	if [ "$build_option_man" ]; then
+		vman bird_exporter.1
+	fi
 	vsv bird_exporter
 	vlicense LICENSE
 }

From 7e70e06028a45dad8b4c5303ee7475c4e34fdc56 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 24 Nov 2020 04:31:31 +0100
Subject: [PATCH 0459/3595] amsynth: optional pandoc

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

diff --git a/srcpkgs/amsynth/template b/srcpkgs/amsynth/template
index 16b66d0e5fd..784153481ce 100644
--- a/srcpkgs/amsynth/template
+++ b/srcpkgs/amsynth/template
@@ -1,9 +1,10 @@
 # Template file for 'amsynth'
 pkgname=amsynth
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pandoc intltool pkg-config"
+configure_args="$(vopt_with man pandoc)"
+hostmakedepends="$(vopt_if man pandoc) intltool pkg-config"
 makedepends="dssi-devel ladspa-sdk gtk+-devel jack-devel alsa-lib-devel
  liblo-devel libsndfile-devel"
 short_desc="Analogue Modeling SYNTHesizer"
@@ -13,6 +14,9 @@ homepage="https://amsynth.github.io/"
 distfiles="https://github.com/amsynth/${pkgname}/releases/download/release-${version}/${pkgname}-${version}.tar.bz2"
 checksum=c0d1e11be528366da543363e73363a4b9fd86f72e03d2d22adb3ec355fa61a80
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="broken pandoc" ;;
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le) build_options_default="man" ;;
 esac

From bbc8cb1ef028b51971428e05999bc916b02b142e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 24 Nov 2020 07:02:52 +0100
Subject: [PATCH 0460/3595] qtcreator: update to 4.13.3

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

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 67bb0e81199..0e32447ac09 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=4.13.2
-revision=2
+version=4.13.3
+revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
 make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
@@ -14,7 +14,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=b00a5c13ba67d2e3436e6d9bf32fba38d780a1de0bc85b813daac672021e9428
+checksum=7b0317ca9354284e98967e94a30a1b813db379017d28d9847847498c113df9e5
 python_version=3
 replaces="qtcreator-data>=0"
 

From 4a5e8706c83cc7e17680a09b093ea4dcdf1ca755 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 23 Nov 2020 18:10:49 +1100
Subject: [PATCH 0461/3595] Signal-Desktop: update to 1.38.1

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 9520e609e00..e12a0cc9e3e 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=1.37.2
+version=1.38.1
 revision=1
 # Due to electron
 # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661
@@ -12,7 +12,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=26da47d05fd3a78609054224159a737ed3efb722719dee3797893006bdc61ac7
+checksum=4d37d1dc2469d720b027c7cbe4c5745a9201d73ef9278f0cec3b4372962ba6e8
 nostrip_files="signal-desktop"
 
 pre_build() {

From d0b6bd424e5b078088ba870befd326fed8ca5baf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Nov 2020 11:05:56 +0100
Subject: [PATCH 0462/3595] jsonnet: update to 0.17.0.

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

diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template
index 08e702ad9a2..c168680bdb6 100644
--- a/srcpkgs/jsonnet/template
+++ b/srcpkgs/jsonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'jsonnet'
 pkgname=jsonnet
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=gnu-makefile
 short_desc="Data templating language"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/jsonnet"
 distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz"
-checksum=fa1a4047942797b7c4ed39718a20d63d1b98725fb5cf563efbc1ecca3375426f
+checksum=076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe
 
 CXXFLAGS="-fPIC"
 

From beef459a2c88b5f1f5be4e0db3d29fb76cfe9e18 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Nov 2020 11:05:59 +0100
Subject: [PATCH 0463/3595] skaffold: update to 1.17.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index b40b744fffb..0ee90a06d66 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.16.0
+version=1.17.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=8ab37c155fc3a68eebfa3f9a94fd9196b207762f666f88f940911105c9d61eee
+checksum=ebf059f14f555a99d3fb7f42efe910f6a6adf1153ccd0ff73cb3f252898febe0

From e703c1481742c5255d5044ec35d0feb1aa6aeabd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Nov 2020 11:06:01 +0100
Subject: [PATCH 0464/3595] k9s: update to 0.24.1.

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

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index ba3adca3e00..6529f165822 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.23.10
+version=0.24.1
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=63ebe6a8f87bcf82b20226357fbbe7a39574e84596979767af7bbb8023f19054
+checksum=28f8b0d033188371e2dddd7a01034b30f661214da2ced5dcb9c4925ba0e78a73

From e51e9dd5a4ee30df28c33851e374343f7c0db166 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Nov 2020 11:06:11 +0100
Subject: [PATCH 0465/3595] python3-argcomplete: update to 1.12.2.

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

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index 92c1be0098f..4a56b0daba1 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,14 +1,13 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
-version=1.12.1
-revision=2
+version=1.12.2
+revision=1
 wrksrc="argcomplete-${version}"
 build_style=python3-module
-pycompile_module="argcomplete"
 hostmakedepends="python3-setuptools"
 short_desc="Bash tab completion for argparse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/argcomplete"
 distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz"
-checksum=849c2444c35bb2175aea74100ca5f644c29bf716429399c0f2203bb5d9a8e4e6
+checksum=de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04

From d1c82f7fac824a4a5abc77061a48720eef9f0b49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 24 Nov 2020 11:16:23 +0100
Subject: [PATCH 0466/3595] swi-prolog: update to 8.2.3.

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

diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 177fce3249d..046edd9af1a 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,6 +1,6 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
-version=8.2.2
+version=8.2.3
 revision=1
 wrksrc="swipl-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="http://www.swi-prolog.org/"
 changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
 distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=35ca864cfd257e3e59ebe8f01e186f8959a8b4d42f17a9a6c04ecdfa5d1e164b
+checksum=9403972f9d87f1f4971fbd4a5644b4976b1b18fc174be84506c6b713bd1f9c93
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 02ceb73cfa501420f3561729fb854aeebd4da68f Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 23 Nov 2020 00:54:51 +0100
Subject: [PATCH 0467/3595] coin3: update to 4.0.0

---
 common/shlibs                                 |  2 +-
 srcpkgs/coin3/patches/0005-gcc-4.7.patch      | 28 --------
 .../coin3/patches/0010-GCC-4.8.0-fixes.patch  | 40 -----------
 .../0012-memhandler-initialization.patch      | 22 ------
 srcpkgs/coin3/patches/fix-missing-deref.patch | 20 ------
 srcpkgs/coin3/patches/no-cpack.patch          |  8 +++
 srcpkgs/coin3/template                        | 70 ++++++-------------
 7 files changed, 30 insertions(+), 160 deletions(-)
 delete mode 100644 srcpkgs/coin3/patches/0005-gcc-4.7.patch
 delete mode 100644 srcpkgs/coin3/patches/0010-GCC-4.8.0-fixes.patch
 delete mode 100644 srcpkgs/coin3/patches/0012-memhandler-initialization.patch
 delete mode 100644 srcpkgs/coin3/patches/fix-missing-deref.patch
 create mode 100644 srcpkgs/coin3/patches/no-cpack.patch

diff --git a/common/shlibs b/common/shlibs
index d97a1f8ff85..c97916b1076 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2708,7 +2708,7 @@ libKF5DNSSD.so.5 kdnssd-5.26.0_1
 libtwaindsm.so.2 twaindsm-2.3.0_1
 libspnav.so.0 libspnav-0.2.3_1
 libsimage.so.20 simage-1.7.0_1
-libCoin.so.60 coin3-3.1.3_1
+libCoin.so.80 coin3-4.0.0_1
 libgl2ps.so.1 gl2ps-1.3.9_1
 libFWOSPlugin.so.11 oce-0.18_1
 libPTKernel.so.11 oce-0.18_1
diff --git a/srcpkgs/coin3/patches/0005-gcc-4.7.patch b/srcpkgs/coin3/patches/0005-gcc-4.7.patch
deleted file mode 100644
index e2d16652445..00000000000
--- a/srcpkgs/coin3/patches/0005-gcc-4.7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/plain/0005-gcc-4.7.patch
-
-From a5bf6656215837a9bdf4d70cdce4be0fedd522e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
-Date: Fri, 4 May 2012 13:30:20 +0200
-Subject: [PATCH 05/10] gcc-4.7.
-
----
- include/Inventor/SbBasic.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/Inventor/SbBasic.h b/include/Inventor/SbBasic.h
-index d038bb1..2ee6b70 100644
---- a/include/Inventor/SbBasic.h
-+++ b/include/Inventor/SbBasic.h
-@@ -25,6 +25,9 @@
- \**************************************************************************/
- 
- #include <Inventor/C/basic.h>
-+#ifndef NDEBUG
-+#include <Inventor/C/errors/debugerror.h>
-+#endif // !NDEBUG
- 
- /* ********************************************************************** */
- /* Trap people trying to use Inventor headers while compiling C source code.
--- 
-1.8.1.4
-
diff --git a/srcpkgs/coin3/patches/0010-GCC-4.8.0-fixes.patch b/srcpkgs/coin3/patches/0010-GCC-4.8.0-fixes.patch
deleted file mode 100644
index bc5167e8f13..00000000000
--- a/srcpkgs/coin3/patches/0010-GCC-4.8.0-fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/plain/0010-GCC-4.8.0-fixes.patch
-
-From 9f5d96a2b9a71ab539237d2dab4c54fc46fc5c5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
-Date: Thu, 18 Apr 2013 19:17:06 +0200
-Subject: [PATCH 10/10] GCC-4.8.0 fixes
-
----
- src/fonts/freetype.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp
-index 760b88b..e705d3a 100644
---- a/src/fonts/freetype.cpp
-+++ b/src/fonts/freetype.cpp
-@@ -32,18 +32,18 @@
- 
-    20050613 mortene. */
- 
--#include "fonts/freetype.h"
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
--#include <stdlib.h>
-+#include <cstdlib>
- #include <assert.h>
- 
- #include "glue/freetype.h"
- #include "glue/GLUWrapper.h"
- 
-+#include "fonts/freetype.h"
-+
- /* ************************************************************************* */
- 
- #ifdef __cplusplus
--- 
-1.8.1.4
-
diff --git a/srcpkgs/coin3/patches/0012-memhandler-initialization.patch b/srcpkgs/coin3/patches/0012-memhandler-initialization.patch
deleted file mode 100644
index 7ad4dc68116..00000000000
--- a/srcpkgs/coin3/patches/0012-memhandler-initialization.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/plain/0012-memhandler-initialization.patch
-Additional information: https://bugzilla.redhat.com/show_bug.cgi?id=1323159
---- Coin-3.1.3/src/misc/SbHash.h.init	2010-03-02 22:20:09.000000000 +0900
-+++ Coin-3.1.3/src/misc/SbHash.h	2016-04-22 16:52:39.888883757 +0900
-@@ -89,6 +89,8 @@
-     cc_memalloc_deallocate(entry->memhandler, ptr);
-   }
-   SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
-+  SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) 
-+		: key(key), obj(obj), memhandler(memhandler) {}
- 
-   Key key;
-   Type obj;
-@@ -218,7 +220,7 @@
-     /* Key not already in the hash table; insert a new
-      * entry as the first element in the bucket
-      */
--    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
-+    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
-     entry->next = this->buckets[i];
-     this->buckets[i] = entry;
- 
diff --git a/srcpkgs/coin3/patches/fix-missing-deref.patch b/srcpkgs/coin3/patches/fix-missing-deref.patch
deleted file mode 100644
index 8c50078b8b7..00000000000
--- a/srcpkgs/coin3/patches/fix-missing-deref.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/3ds/SoStream.cpp.orig	2018-01-16 11:18:58.965420684 +0100
-+++ ./src/3ds/SoStream.cpp	2018-01-16 11:18:23.140563596 +0100
-@@ -176,7 +176,7 @@ do { \
-   if (!gotNum) { setBadBit(); return FALSE; } \
-  \
-   char *ce; \
--  s = '\0'; \
-+  *s = '\0'; \
-   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
-  \
-   if (ce != s) \
-@@ -273,7 +273,7 @@ do { \
- gotAll: \
-   \
-   char *ce; \
--  s = '\0'; \
-+  *s = '\0'; \
-   double tempVal = _convertFunc_(buf, &ce); \
-  \
-   if (ce != s) \
diff --git a/srcpkgs/coin3/patches/no-cpack.patch b/srcpkgs/coin3/patches/no-cpack.patch
new file mode 100644
index 00000000000..5417d2e66c9
--- /dev/null
+++ b/srcpkgs/coin3/patches/no-cpack.patch
@@ -0,0 +1,8 @@
+--- CMakeLists.txt.ORIG
++++ CMakeLists.txt
+@@ -815,4 +815,4 @@
+ 
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++#add_subdirectory(cpack.d)
diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template
index 4150c863e9f..d5483ee048c 100644
--- a/srcpkgs/coin3/template
+++ b/srcpkgs/coin3/template
@@ -1,55 +1,30 @@
 # Template file for 'coin3'
 pkgname=coin3
-version=3.1.3
-revision=5
-wrksrc="Coin-${version}"
-build_style=gnu-configure
-configure_args="--includedir=/usr/include/Coin3 --disable-dependency-tracking
- --disable-static --enable-threadsafe --enable-exceptions
- --disable-dl-simage --disable-dl-glu --disable-dl-libbzip2
- --disable-dl-zlib --disable-dl-freetype --disable-dl-fontconfig
- --enable-3ds-import --enable-html
- sim_ac_simage_configcmd=$XBPS_CROSS_BASE/usr/bin/simage-config"
-hostmakedepends="pkg-config doxygen perl"
-makedepends="freetype-devel glu-devel zlib-devel bzip2-devel
- fontconfig-devel boost-devel simage-devel"
+version=4.0.0
+revision=1
+wrksrc="coin-Coin-${version}"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/Coin3
+ -DCMAKE_BUILD_TYPE=Release -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
+hostmakedepends="doxygen graphviz"
+makedepends="boost-devel glu-devel"
 short_desc="High-level 3D graphics toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
-# HomePage tells BSD 3-Clause license, but tarball is GPLv2
-license="GPL-2.0-only"
-homepage="https://bitbucket.org/Coin3D/coin/wiki/Home"
-distfiles="https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz"
-checksum=583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417
-patch_args="-Np1"
+license="BSD-3-Clause"
+homepage="https://coin3d.github.io/"
+distfiles="https://github.com/coin3d/coin/archive/Coin-${version}.tar.gz"
+checksum=b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805
 
-post_extract() {
-	# remove bundled boost headers
-	rm -rf ${wrksrc}/include/boost
-}
-
-do_configure() {
-	# only way to compute and point freetype2 stuff to configure
-	: ${configure_script:=./configure}
-	CPPFLAGS+="$(pkg-config --cflags freetype2)" ${configure_script} ${configure_args}
-}
-
-post_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# configure checks are awfull
-		sed -i -e 's,^#define SIM_TIMEVAL_TV_SEC_T { },#define SIM_TIMEVAL_TV_SEC_T time_t,' \
-		       -e 's,^#define SIM_TIMEVAL_TV_USEC_T { },#define SIM_TIMEVAL_TV_USEC_T suseconds_t,' \
-		       ${wrksrc}/src/config.h
-		;;
-	esac
-}
+if [ "$CROSS_BUILD" ]; then
+	# bypass runtime test (quote hashing is fine with gcc 9.3)
+	configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE=0"
+	configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE__TRYRUN_OUTPUT=''"
+fi
 
 post_install() {
-	if [ "$CROSS_BUILD" ]; then
-		sed -i -e "s,$XBPS_CROSS_BASE,,g" \
-			$DESTDIR/usr/share/Coin/conf/coin-default.cfg \
-			$DESTDIR/usr/lib/pkgconfig/Coin.pc
-	fi
+	# coin-config is superseeded by cmake support
+	rm $DESTDIR/usr/bin/coin-config
+	vlicense COPYING
 }
 
 coin3-devel_package() {
@@ -57,17 +32,14 @@ coin3-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/bin/coin-config
+		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		vmove usr/share/aclocal
-		vmove usr/share/man
 	}
 }
 
 coin3-doc_package() {
 	short_desc+=" - documentation"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 53b45192c163c5d860a9407fb06d727298c6c9a3 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 23 Nov 2020 00:54:54 +0100
Subject: [PATCH 0468/3595] python3-pivy: rebuild against coin3-4.0.0

* fix license
* fix update detection
* setup.py: switch to cmake that is needed for coin3 4.0
---
 srcpkgs/python3-pivy/template | 65 ++++++++++++++++++++++++-----------
 srcpkgs/python3-pivy/update   |  3 --
 2 files changed, 45 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-pivy/update

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index 40570303769..a0844f8b7e0 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,39 +1,64 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
 version=0.6.5
-revision=1
+revision=2
 wrksrc="pivy-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel swig"
-makedepends="python3-devel coin3-devel qt5-devel"
+hostmakedepends="python3-devel swig cmake"
+makedepends="python3-devel coin3-devel"
 short_desc="Python3 bindings for the high-level 3D graphics library Coin"
 maintainer="yopito <pierre.bourgin@free.fr>"
-license="0BSD"
+license="ISC"
 homepage="https://github.com/coin3d/pivy"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=16f2e339e5c59a6438266abe491013a20f53267e596850efad1559564a2c1719
 
+# still relevant with pivy 0.6.5 ?
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*);;
 	ppc*) broken="{standard input}:3376761: Error: operand out of range";;
 esac
 
-if [ "$CROSS_BUILD" ]; then
-	CFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/Coin3"
-fi
-
-post_extract() (
-	# use setup_old.py until have Coin with cmake support
-	mv -f setup_old.py setup.py
-)
-
-post_patch() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i setup.py \
-			-e '/if not self[.]check_cmd_exists.*coin-config/,+1d' \
-			-e "s!coin-config!$XBPS_CROSS_BASE/usr/bin/coin-config!" \
-			-e "/INCLUDE_DIR.*coin-config/s!=!= \"$XBPS_CROSS_BASE\" +!"
-	fi
+# setup.py calls cmake directly, so can't rely on xbps's cmake crossbuild support:
+# let's recreate here. Upstream should switch to cmake on next release (0.6.6).
+
+pre_configure() {
+	[ -z "$CROSS_BUILD" ] && return 0
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+		i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+		arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+		mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+		ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+		ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+		ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+		*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+	esac
+	cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
+_EOF
+	cat >$XBPS_WRAPPERDIR/cmake <<_EOF
+#!/bin/sh
+/usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$wrksrc/cross_${XBPS_CROSS_TRIPLET}.cmake "$@"
+_EOF
+	chmod +x $XBPS_WRAPPERDIR/cmake
 }
 
 post_install() {
diff --git a/srcpkgs/python3-pivy/update b/srcpkgs/python3-pivy/update
deleted file mode 100644
index d4a4e715386..00000000000
--- a/srcpkgs/python3-pivy/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site=https://bitbucket.org/Coin3D/pivy/downloads/?tab=tags
-pkgname=
-ignore="20101207"

From 8509312eb0d6a5c9ccf1947dbccbfd95520ac47d Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 23 Nov 2020 00:54:55 +0100
Subject: [PATCH 0469/3595] freecad: libexecinfo usage, rebuild with coin3
 4.0.0

libexecinfo's usage is incomplete: 002-execinfo.patch still needed

[ci skip]
---
 .../patches/010-salomesmesh-execinfo.patch    | 30 -----------
 .../patches/103-find-coin3v4-doc.patch        | 50 +++++++++++++++++++
 .../freecad/patches/151-python-warning.patch  | 39 +++++++++++++++
 srcpkgs/freecad/template                      |  3 +-
 4 files changed, 91 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch
 create mode 100644 srcpkgs/freecad/patches/103-find-coin3v4-doc.patch
 create mode 100644 srcpkgs/freecad/patches/151-python-warning.patch

diff --git a/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch b/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch
deleted file mode 100644
index 2b46616ad7a..00000000000
--- a/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
-+++ src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
-@@ -29,7 +29,9 @@
- #ifndef WIN32
- #include <unistd.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <execinfo.h>
-+#endif
- #endif
- 
- 
-@@ -109,6 +111,7 @@
- #ifndef WIN32
-   void print_traceback()
-   {
-+#ifdef __GLIBC__
-     void *array[50];
-     size_t size;
-     char **strings;
-@@ -123,6 +126,9 @@
-       }
- 
-     free (strings);
-+#else     
-+   std::cerr << "sorry, no backtrace on musl libc";
-+#endif
-   }
- #else
-   #if (_MSC_VER >= 1400) // Visual Studio 2005
diff --git a/srcpkgs/freecad/patches/103-find-coin3v4-doc.patch b/srcpkgs/freecad/patches/103-find-coin3v4-doc.patch
new file mode 100644
index 00000000000..5b7de514de4
--- /dev/null
+++ b/srcpkgs/freecad/patches/103-find-coin3v4-doc.patch
@@ -0,0 +1,50 @@
+From 04833a5f1cbc07f8f6ae94453c4535e13789aa05 Mon Sep 17 00:00:00 2001
+From: yopito <pierre.bourgin@free.fr>
+Date: Mon, 6 Jul 2020 06:54:07 +0200
+Subject: [PATCH] build: fix Coin 3d documentation discovering
+
+* coin3d 4.0.0 default location is /usr/share/doc/Coin/html/
+* misuses of find_files() if several candidates for filename
+* export variable COIN3D_DOC_FOUND that is used by cMake/FreeCAD_Helpers/PrintFinalReport.cmake
+---
+ cMake/FindCoin3DDoc.cmake | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git cMake/FindCoin3DDoc.cmake cMake/FindCoin3DDoc.cmake
+index 883368445..c6c92f260 100644
+--- cMake/FindCoin3DDoc.cmake
++++ cMake/FindCoin3DDoc.cmake
+@@ -23,18 +23,19 @@ IF (COIN3D_FOUND)
+       find_path(COIN3D_DOC_PATH index.html 
+                 /usr/share/doc/libcoin80-doc/html
+                 /usr/share/doc/coin/html
++                /usr/share/doc/Coin/html
+       )
+       IF( EXISTS ${COIN3D_DOC_PATH})
+         message(STATUS "Coin3D doc is installed")
+-        find_file(COIN3D_DOC_TAGFILE coin.tag Coin.tag 
+-            ${COIN3D_DOC_PATH}
++        find_file(COIN3D_DOC_TAGFILE NAMES coin.tag Coin.tag 
++            PATHS ${COIN3D_DOC_PATH}
+         )
+         IF( EXISTS ${COIN3D_DOC_TAGFILE})
+           SET( COIN3D_DOC_FOUND "YES"
+           )
+         ELSE( EXISTS ${COIN3D_DOC_TAGFILE})
+-          find_file(COIN3D_DOC_TAGFILE_GZ coin.tag.gz Coin.tag.gz 
+-              ${COIN3D_DOC_PATH}
++          find_file(COIN3D_DOC_TAGFILE_GZ NAMES coin.tag.gz Coin.tag.gz 
++              PATHS ${COIN3D_DOC_PATH}
+           )
+           IF( EXISTS ${COIN3D_DOC_TAGFILE_GZ})
+             message(STATUS "  Found ${COIN3D_DOC_TAGFILE_GZ}")
+@@ -85,4 +86,5 @@ if(COIN3D_DOC_FOUND)
+   message(STATUS "  Location: ${COIN3D_DOC_PATH}")
+ endif(COIN3D_DOC_FOUND)
+ 
+-
++# export for others
++SET( COIN3D_DOC_FOUND "${COIN3D_DOC_FOUND}" CACHE BOOL "Coin3d documentation available")
+-- 
+2.27.0
+
diff --git a/srcpkgs/freecad/patches/151-python-warning.patch b/srcpkgs/freecad/patches/151-python-warning.patch
new file mode 100644
index 00000000000..e76c8b1c654
--- /dev/null
+++ b/srcpkgs/freecad/patches/151-python-warning.patch
@@ -0,0 +1,39 @@
+diff --git src/Mod/Fem/feminout/importFenicsMesh.py src/Mod/Fem/feminout/importFenicsMesh.py
+index 1bb40de..a0b5484 100644
+--- src/Mod/Fem/feminout/importFenicsMesh.py
++++ src/Mod/Fem/feminout/importFenicsMesh.py
+@@ -154,7 +154,7 @@ def export(objectslist, fileString):
+             FreeCAD.Console.PrintWarning("Tri6 -> Tri3, Tet10 -> Tet4, etc.\n")
+             writeFenicsXML.write_fenics_mesh_xml(obj, fileString)
+         elif fileExtension.lower() == '.xdmf':
+-            if importToolsFem.get_FemMeshObjectMeshGroups(obj) is not ():
++            if importToolsFem.get_FemMeshObjectMeshGroups(obj):
+                 # if there are groups found, make task panel available
+                 panel = WriteXDMFTaskPanel(obj, fileString)
+                 FreeCADGui.Control.showDialog(panel)
+diff --git src/Mod/Fem/feminout/writeFenicsXDMF.py src/Mod/Fem/feminout/writeFenicsXDMF.py
+index 9e7f01b..5a93823 100644
+--- src/Mod/Fem/feminout/writeFenicsXDMF.py
++++ src/Mod/Fem/feminout/writeFenicsXDMF.py
+@@ -258,7 +258,7 @@ def write_fenics_mesh_xdmf(fem_mesh_obj, outputfile, group_values_dict={}, encod
+     fem_mesh = fem_mesh_obj.FemMesh
+     gmshgroups = get_FemMeshObjectMeshGroups(fem_mesh_obj)
+ 
+-    if gmshgroups is not ():
++    if gmshgroups:
+         print('found mesh groups')
+ 
+     for g in gmshgroups:
+diff --git src/Mod/PartDesign/WizardShaft/Shaft.py src/Mod/PartDesign/WizardShaft/Shaft.py
+index c519b97..8c20eb4 100644
+--- src/Mod/PartDesign/WizardShaft/Shaft.py
++++ src/Mod/PartDesign/WizardShaft/Shaft.py
+@@ -88,7 +88,7 @@ class Shaft:
+         # We don't call equilibrium() here because the new segment has no constraints defined yet
+         # Fix face reference of fixed segment if it is the last one
+         for i in range(1,  len(self.segments)):
+-            if self.segments[i].constraintType is not "Fixed":
++            if self.segments[i].constraintType != "Fixed":
+                 continue
+             if i == len(self.segments) - 1:
+                 self.segments[index].constraint.References = [( self.feature.feature,  "Face%u" % (2 * (index+1) + 1) )]
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 76d6df64724..6fe749b53d7 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.18.4
-revision=9
+revision=10
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 
@@ -38,6 +38,7 @@ checksum=4e0cce447b31b8989a00cf68c49ae012ce8e5546a56c6e0874fbd8f7ddedffd2
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
+	LDFLAGS="-lexecinfo"
 fi
 
 post_extract() {

From 8e58a1bd96a1b4fee8a95ccd0a36cfc9a7e41769 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 19:11:54 +0200
Subject: [PATCH 0470/3595] broot: update to 1.0.5.

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

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

From 92ce5b7c035f6bd5ab3963d17ca4ff9bcda10701 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 19:36:24 +0200
Subject: [PATCH 0471/3595] ffmpegthumbs: update to 20.08.3.

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

diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 3fdf4200867..d37abf98f0e 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,6 +1,6 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=20.08.1
+version=20.08.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=8b7cd6bd27b29977d0406b08c2cf33988c651a2f59392be47f076e49eea5673b
+checksum=f179cc304eeb513444fe0079bddb34ed18cb2ef1125b6294e87de44412bed0a0

From 383cb85cf30e292645bbe2922f722b18a60adc8a Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Mon, 23 Nov 2020 22:14:58 +0200
Subject: [PATCH 0472/3595] R-cran-callr: update to 3.5.1.

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

diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index d20af5bff29..a844ef36722 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-callr'
 pkgname=R-cran-callr
-version=3.4.3
-revision=2
+version=3.5.1
+revision=1
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"
@@ -9,7 +9,7 @@ short_desc="Call R from R"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/callr"
-checksum=01b7277f20c1d662c6bebbfa2798d179922b36d4148b4298853579aeda0382b5
+checksum=ce338c648cc9ab501168a55f93e68fc81e31dc5ec881e908b5b4a9d6f5bd8696
 
 post_install() {
 	vlicense LICENSE

From 5f5d7bd13dca99288051feb4ea1705da2962ed0a Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Mon, 23 Nov 2020 22:17:58 +0200
Subject: [PATCH 0473/3595] R-cran-generics: update to 0.1.0.

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

diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index d35b29a6a34..0d3797c2cdd 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-generics'
 pkgname=R-cran-generics
-version=0.0.2
-revision=2
+version=0.1.0
+revision=1
 build_style=R-cran
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/r-lib/generics"
-checksum=71b3d1b719ce89e71dd396ac8bc6aa5f1cd99bbbf03faff61dfbbee32fec6176
+checksum=ab71d1bdbb66c782364c61cede3c1186d6a94c03635f9af70d926e2c1ac88763

From 3226095a24db53207aaec6a217b680ba24048abd Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Mon, 23 Nov 2020 22:21:57 +0200
Subject: [PATCH 0474/3595] R-cran-rprojroot: update to 2.0.2.

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

diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 8e92f0febfc..69f37f7cf77 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -1,12 +1,10 @@
 # Template file for 'R-cran-rprojroot'
 pkgname=R-cran-rprojroot
-version=1.3r2
-revision=2
+version=2.0.2
+revision=1
 build_style=R-cran
-hostmakedepends="R-cran-backports"
-depends="R-cran-backports"
 short_desc="Finding Files in Project Subdirectories"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-3.0-only"
-homepage="https://github.com/krlmlr/rprojroot"
-checksum=df5665834941d8b0e377a8810a04f98552201678300f168de5f58a587b73238b
+homepage="https://github.com/r-lib/rprojroot"
+checksum=5fa161f0d4ac3b7a99dc6aa2d832251001dc92e93c828593a51fe90afd019e1f

From 73769540f544faebe4653931892c0ef15ce84fab Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Mon, 23 Nov 2020 22:25:01 +0200
Subject: [PATCH 0475/3595] R-cran-rstudioapi: update to 0.13.

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

diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index 834afe66f5f..d04c0773621 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -1,13 +1,13 @@
 # Template file for 'R-cran-rstudioapi'
 pkgname=R-cran-rstudioapi
-version=0.11
-revision=2
+version=0.13
+revision=1
 build_style=R-cran
 short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/rstudio/rstudioapi"
-checksum=13e07fb7e2eba8cf1d885db2721901d676d219a1042d7ef5d166125e4905306b
+checksum=aac35bbdcb4a8e8caba943bc8a2b98120e8940b80cd1020224bb1a26ff776d8b
 
 post_install() {
 	vlicense LICENSE

From 3af0fa36a6986c667e86735d402e5186359e4c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 22 Nov 2020 08:12:57 +0100
Subject: [PATCH 0476/3595] qpdf: update to 10.0.4.

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

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 260c5c0d37f..f717d60ea36 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.0.3
+version=10.0.4
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=d4e76613334bcbda5407061a6452b6a8197950b42a04a413a2dfb8ef7103594e
+checksum=40924c0894eb3b6d228a2b0135c77772a34aeb4cac5f0a518cd6cd7aa198640a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From c006f6a365eb3a05f26fbd7e40c634a1bb94e8e2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 17:25:14 -0600
Subject: [PATCH 0477/3595] EternalTerminal: update to 6.0.13

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

diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index dd1cc840b12..7551dd588d8 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,17 +1,17 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
-version=6.0.11
-revision=3
+version=6.0.13
+revision=1
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"
 makedepends="gflags-devel libsodium-devel protobuf-devel"
 short_desc="Re-Connectable secure remote shell"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="Apache-2.0"
 homepage="https://eternalterminal.dev/"
 distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
-checksum=ca837f18f9b1b23c97e56cb68f6b42e93ad3fb9d68f5fedd24bbab24519dbe5d
+checksum=728c3a444d666897c710e33fe473d8d289263a59574451b13aa53ec3c6ac88b3
 system_accounts="_eternal"
 
 LDFLAGS="-lgflags"

From cc116f474904339c7e2c43449ce83fd00689c8a3 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 24 Nov 2020 12:23:42 +1100
Subject: [PATCH 0478/3595] MoarVM: update to 2020.11.

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

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

From f0330d0893740314ecfa42bdca2c668cd0d583f0 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 24 Nov 2020 12:27:29 +1100
Subject: [PATCH 0479/3595] nqp: update to 2020.11.

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

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

From 15cbec2fb0bf23d5acd715b7a14da0d5b5a67ca2 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 24 Nov 2020 12:28:58 +1100
Subject: [PATCH 0480/3595] rakudo: update to 2020.11.

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

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

From b5ae0200b9a2623801dcd5298a8ab4b4e042ea5b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 18:57:57 -0600
Subject: [PATCH 0481/3595] ckbcomp: update to 1.198

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

diff --git a/srcpkgs/ckbcomp/template b/srcpkgs/ckbcomp/template
index 714be06ca4a..d218d82c1d7 100644
--- a/srcpkgs/ckbcomp/template
+++ b/srcpkgs/ckbcomp/template
@@ -1,6 +1,6 @@
 # Template file for 'ckbcomp'
 pkgname=ckbcomp
-version=1.197
+version=1.198
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/installer-team/console-setup"
 changelog="https://salsa.debian.org/installer-team/console-setup/-/raw/master/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=2ddad40368e95291c9670d8ec7205896835d9e42df532bde3d89a13e5f5357e0
+checksum=f3aca4aeb76ecfe76e29435ce59d2c55756da70b03deb7f02cbee093000cb725
 
 do_install() {
 	vbin Keyboard/ckbcomp

From b48939ae06ee95b7ae92be547ede80ab515366c7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 23 Nov 2020 18:40:33 +0200
Subject: [PATCH 0482/3595] fonttools: update to 4.17.1.

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

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index 2dd0af782ce..71d1973f2ec 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,7 +1,7 @@
 # Template file for 'fonttools'
 pkgname=fonttools
-version=4.8.1
-revision=3
+version=4.17.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="svenper <svenper@tuta.io>"
 license="MIT, OFL-1.1, BSD-3-Clause"
 homepage="https://github.com/fonttools/fonttools"
 distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz"
-checksum=735a48467b1973a3e09bb2144d45ce82683fbe891dc1be70ef7fbcdc6054e6d0
+checksum=89e17920b2d5dce39fb538a4cc65c797a9bf604a481408a1a9a677e3e98f37a4
 replaces="python-fonttools>=0 python3-fonttools>=0"
 provides="python-fonttools-${version}