From 3d603d0a7c0184d1b19ebe10464c7f18ade2f1a0 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Wed, 14 Jul 2021 11:39:07 +0200
Subject: [PATCH 01/28] endless-sky: update to 0.9.14

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

diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index 00583361ce76..30019f5e8510 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
-version=0.9.13
-revision=2
+version=0.9.14
+revision=1
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
  libopenal-devel libpng-devel"
@@ -10,5 +10,5 @@ maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://endless-sky.github.io/"
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
-checksum=001c8a28bbec7491f2725fbaa52b1ade813d33cec2d16521f241c80d04685b9d
+checksum=6c22571b5398a18297aa7410890c319b5cb292a833889b4e7c0cd94d831f29af
 replaces="endless-sky-data>=0"

From a12a58e09fcbeef7a17e865adbdca00119ac0243 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jul 2021 18:31:34 +0200
Subject: [PATCH 02/28] nncp: update to 7.3.2.

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

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

From 7c362b81da6db429258f99430d933ab01a1362ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Jul 2021 18:38:33 +0200
Subject: [PATCH 03/28] python3-pwntools: update to 4.6.0.

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

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

From 2fa732cc4df88f36a9d9d98aee7d403407b612fe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 14 Jul 2021 12:48:45 +0200
Subject: [PATCH 04/28] ruby: update to 2.7.4.

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

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index d7524fba3519..41c6ff9726ab 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,7 +2,7 @@
 _ruby_abiver=2.7.0
 
 pkgname=ruby
-version=2.7.3
+version=2.7.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
@@ -16,7 +16,7 @@ homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3e90e5a41d4df90e19c307ab0fb41789992c0b0128e6bbaa669b89ed44a0b68b
+checksum=bffa8aec9da392eda98f1c561071bb6e71d217d541c617fc6e3282d79f4e7d48
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

From 101340e55768a09b6510ffd072b545200c18f2fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 14 Jul 2021 12:48:48 +0200
Subject: [PATCH 05/28] gnuchess: update to 6.2.9.

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

diff --git a/srcpkgs/gnuchess/template b/srcpkgs/gnuchess/template
index 55c123c51101..476544ead9e7 100644
--- a/srcpkgs/gnuchess/template
+++ b/srcpkgs/gnuchess/template
@@ -1,6 +1,6 @@
 # Template file for 'gnuchess'
 pkgname=gnuchess
-version=6.2.8
+version=6.2.9
 revision=1
 build_style=gnu-configure
 makedepends="readline-devel"
@@ -9,6 +9,6 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/chess/chess.html"
 distfiles="${GNU_SITE}/chess/${pkgname}-${version}.tar.gz"
-checksum=d50446cda8012240321da39cddbb4df4d08458a8d538a4738882814139583847
+checksum=ddfcc20bdd756900a9ab6c42c7daf90a2893bf7f19ce347420ce36baebc41890
 
 LDFLAGS="-Wl,-z,stack-size=2097152"

From 9135c337d789ebfbd47d8f9c107c9263c4bc8a25 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 14 Jul 2021 12:48:50 +0200
Subject: [PATCH 06/28] z3: update to 4.8.12.

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

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 789712fa6450..3a58cf593776 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.11
+version=4.8.12
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=99e912b9af76a17f8827f89afcf4da117736f3877a8bbdd737c548c6541009d7
+checksum=e3aaefde68b839299cbc988178529535e66048398f7d083b40c69fe0da55f8b7
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From 631c85c0a62f67edacfed14f4f24257c7db1ce76 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Wed, 14 Jul 2021 07:40:09 +0200
Subject: [PATCH 07/28] python3-pikepdf: update to 2.15.0.

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

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 01ea7b233b26..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.14.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=ef21b445485439bee503f2ce089be4ed687afae468ff493960b7025c916c2753
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 3abf05b754f98278e913856e005a4d81f204e0b6 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Tue, 13 Jul 2021 22:24:33 -0700
Subject: [PATCH 08/28] GoLand: update to 2021.1.3.

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

diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 24209cb2e882..898701d61f84 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
 # Template file for 'GoLand'
 pkgname=GoLand
-version=2020.3.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
 depends="jetbrains-jdk-bin"
@@ -9,7 +9,7 @@ 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=5f1bacaadac20259b58215fb3a5f58fe97ba1051279a7f9060693d1e1ea18b03
+checksum=ade387550e79a8e4cdd31cfbdef5f344f30d2c4e005144a44e95cdb1419ac977
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -17,23 +17,30 @@ python_version=3
 
 post_extract() {
 	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/ppc64le
+
+	# Remove files for other OSes
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
 			rm -rf bin/fsnotifier
 			rm -rf bin/goland.vmoptions
-			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/performanceTesting/bin/libyjpagent.so
 			;;
 		i686)
 			rm -rf bin/fsnotifier64
 			rm -rf bin/goland64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86_64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			;;
 	esac
 }

From 323297a762889983f00fa63af4cffd224a2ac3f6 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Tue, 13 Jul 2021 22:52:15 -0700
Subject: [PATCH 09/28] DataGrip: update to 2021.1.3.

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

diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
index 888e2d59b3f4..d7aff462e167 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -1,6 +1,6 @@
 # Template file for 'DataGrip'
 pkgname=DataGrip
-version=2020.1.5
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
 wrksrc="DataGrip-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/datagrip"
 distfiles="https://download.jetbrains.com/datagrip/datagrip-${version}.tar.gz"
-checksum=a97231cbfe656ef3fcad5b66f3bd484cc676b5e89780543efdd49420ce690518
+checksum=ed34ca1a00c9c98e153c575fcc5d257480180ef027284dd44e652c0ef91e1152
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -18,8 +18,15 @@ python_version=3
 
 post_extract() {
 	# Remove files for other CPU architectures
+	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/mips64el
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+	# Remove files for other OSes
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
 			rm -rf bin/fsnotifier

From fb9f36b1b940a53e7ccf90c83bbf4c4420f91f67 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 14 Jul 2021 12:24:04 +0200
Subject: [PATCH 10/28] vscode: update to 1.58.1

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index e036440f0982..a7d837f600f4 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.0
+version=1.58.1
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=4797c34c04a65265a094a5bdb877c036fda565b7c1bbad4aeee9656e6e46dbbd
+checksum=1468d48757e5539b02a957090eebfccccf7ce80c725107ebbb2333681dc22c63
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From 3de28091d1775af2ba1972ecb4ad8371f20cbe58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Jul 2021 10:03:32 -0300
Subject: [PATCH 11/28] strace: add build option for static binary.

Can be useful for debugging faulty systems.
---
 srcpkgs/strace/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index cfc17796a156..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,10 +1,10 @@
 # Template file for 'strace'
 pkgname=strace
 version=5.12
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-silent-rules --with-libunwind"
-makedepends="libunwind-devel"
+configure_args="--enable-silent-rules $(vopt_with libunwind)"
+makedepends="$(vopt_if libunwind libunwind-devel)"
 short_desc="System Call Tracer"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-or-later"
@@ -13,6 +13,16 @@ changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
 checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
+build_options="static libunwind"
+build_options_default="libunwind"
+vopt_conflict static libunwind # configure fails
+desc_option_static="Build static strace binary"
+desc_option_libunwind="Support printing backtraces for every syscall"
+
+if [ "$build_option_static" ]; then
+	LDFLAGS=-static
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|ppc64*) configure_args+=" --enable-mpers=no" ;;
 	# work around https://github.com/strace/strace/issues/133

From ecd59fc299e558d4f188a24fcf6234337b1f7541 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 14 Jul 2021 12:21:55 +0200
Subject: [PATCH 12/28] New package: esh

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

diff --git a/srcpkgs/esh/template b/srcpkgs/esh/template
new file mode 100644
index 000000000000..f9595a2f363a
--- /dev/null
+++ b/srcpkgs/esh/template
@@ -0,0 +1,17 @@
+# Template file for 'esh'
+pkgname=esh
+version=0.3.1
+revision=1
+hostmakedepends="ruby-asciidoctor"
+depends="awk sed"
+short_desc="Simple templating engine based on shell"
+maintainer="Jakub Jirutka <jakub@jirutka.cz>"
+license="MIT"
+homepage="https://github.com/jirutka/esh"
+distfiles="https://github.com/jirutka/esh/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum="62606e755fbd78a92f2f0a5fd4bc6095b593936d9ffdbeaf8125b222fcb0ec1c"
+
+do_install() {
+	make install prefix=/usr DESTDIR=$DESTDIR
+	vlicense LICENSE
+}

From af4aa1e955d5c376335b881294bd1d75a4051a01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Jul 2021 11:31:00 +0200
Subject: [PATCH 13/28] xorg-server-xwayland: update to 21.1.2.

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

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 2bc4ff38b1c6..9ffec73279f2 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=21.1.1
+version=21.1.2
 revision=1
 wrksrc="xserver-xwayland-$version"
 build_style=meson
@@ -13,11 +13,12 @@ makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
  MesaLib-devel libxcb-devel"
 depends="xorg-server-common"
 short_desc="Nested X server that runs as a wayland client"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=f93c8a92d1f8eabde40713c7af01200a9040b3b73eafba54589732dac0a937fe
+checksum=fe0f5ef3274962f66251b168b0d5e122ad9c1069fa704c64595ce36d388b2a38
+make_check=no # needs xtest repository
 
 post_install() {
 	# protocol.txt is provided by xorg-server-common

From 631dd5c99319aa1cee9d46114a799e51d2141122 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 11 Jul 2021 23:43:37 +0300
Subject: [PATCH 14/28] glu: update to 9.0.2.

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

diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template
index 49d8c41d9488..dd54bebdd921 100644
--- a/srcpkgs/glu/template
+++ b/srcpkgs/glu/template
@@ -1,17 +1,17 @@
 # Template file for 'glu'
 pkgname=glu
-version=9.0.1
-revision=2
-build_style=gnu-configure
-configure_args="--disable-static"
+version=9.0.2
+revision=1
+build_style=meson
+configure_args="-Ddefault_library=shared"
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel"
 short_desc="Mesa OpenGL utility library (GLU)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="SGI-B-2.0"
-homepage="http://cgit.freedesktop.org/mesa/glu/"
+homepage="https://gitlab.freedesktop.org/mesa/glu"
 distfiles="https://mesa.freedesktop.org/archive/glu/glu-${version}.tar.gz"
-checksum=f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7
+checksum=24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65
 replaces="libGLU<9.0"
 
 glu-devel_package() {

From a710c7fdab8f683428f4dc8e58319fdd12c69339 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 20 Jun 2021 17:50:52 +0200
Subject: [PATCH 15/28] pipewire: update to 0.3.31.

* add a libusb dependency to improve bluetooth device capabilities detection
* add experimental system services for pipewire and pipewire-pulse
---
 srcpkgs/pipewire/files/README.voidlinux       |  4 ++
 srcpkgs/pipewire/files/pipewire-pulse/run     |  7 +++
 srcpkgs/pipewire/files/pipewire/run           |  8 +++
 srcpkgs/pipewire/patches/6df32666b4.patch     | 62 -------------------
 .../patches/autostart-media-session.patch     | 10 +--
 srcpkgs/pipewire/template                     | 15 +++--
 6 files changed, 34 insertions(+), 72 deletions(-)
 create mode 100644 srcpkgs/pipewire/files/pipewire-pulse/run
 create mode 100644 srcpkgs/pipewire/files/pipewire/run
 delete mode 100644 srcpkgs/pipewire/patches/6df32666b4.patch

diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 0c3d167f0aef..33892fdef84b 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -7,3 +7,7 @@ Optional dependencies:
 * `libspa-jack` for running pipewire and jack side-by-side
 * `libspa-v4l2` for video camera support
 * `rtkit` for realtime priority acquisition
+
+The system services /etc/sv/pipewire and /etc/sv/pipewire-pulse are
+experimental and only needed in rare cases so using them should be
+avoided in most setups.
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
new file mode 100644
index 000000000000..f718570498a9
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire-pulse/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+# this service is experimental and most setups should start pipewire as a user,
+# for further information, please refer to the handbook
+! [ -d /run/pulse ] && install -m 755 -g _pipewire -o _pipewire -d /run/pulse
+umask 002
+export PULSE_RUNTIME_PATH=/run
+exec chpst -u _pipewire:_pipewire pipewire-pulse
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
new file mode 100644
index 000000000000..359d9871e0d1
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+# this service is experimental and most setups should start pipewire as a user,
+# for further information, please refer to the handbook
+! [ -d /run/pipewire ] && install -m 755 -g _pipewire -o _pipewire -d /run/pipewire
+umask 002
+export PIPEWIRE_RUNTIME_DIR=/run/pipewire
+export XDG_CONFIG_HOME=/var/lib
+exec chpst -u _pipewire:_pipewire:audio:video pipewire
diff --git a/srcpkgs/pipewire/patches/6df32666b4.patch b/srcpkgs/pipewire/patches/6df32666b4.patch
deleted file mode 100644
index ea42982b704e..000000000000
--- a/srcpkgs/pipewire/patches/6df32666b4.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6df32666b44b5174aace3dcff39f39a58eba508f Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 20 May 2021 11:22:04 +0200
-Subject: [PATCH] filter-chain: check external ports only once
-
-When we duplicate the pipeline to match the channels, only check
-if a port was used only once for the first instance. Makes
-demonic filter work again.
----
- src/modules/module-filter-chain.c | 18 ++++--------------
- 1 file changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
-index b1e727069..bb346b6d8 100644
---- a/src/modules/module-filter-chain.c
-+++ b/src/modules/module-filter-chain.c
-@@ -972,16 +972,6 @@ static int parse_link(struct graph *graph, struct spa_json *json)
- 		pw_log_error("unknown input port %s", input);
- 		return -ENOENT;
- 	}
--	if (in_port->external != SPA_ID_INVALID) {
--		pw_log_info("%s already used as graph input %d, use mixer",
--				input, in_port->external);
--		return -EINVAL;
--	}
--	if (out_port->external != SPA_ID_INVALID) {
--		pw_log_info("%s already used as graph output %d, use copy",
--				output, out_port->external);
--		return -EINVAL;
--	}
- 	if (in_port->n_links > 0) {
- 		pw_log_info("Can't have more than 1 link to %s, use a mixer", input);
- 		return -ENOTSUP;
-@@ -1334,10 +1324,10 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
- 				} else {
- 					desc = port->node->desc;
- 					d = desc->desc;
--					if (port->external != SPA_ID_INVALID) {
-+					if (i == 0 && port->external != SPA_ID_INVALID) {
- 						pw_log_error("input port %s[%d]:%s already used as input %d, use mixer",
- 							port->node->name, i, d->PortNames[port->p],
--							graph->n_input);
-+							port->external);
- 						res = -EBUSY;
- 						goto error;
- 					}
-@@ -1382,10 +1372,10 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
- 				} else {
- 					desc = port->node->desc;
- 					d = desc->desc;
--					if (port->external != SPA_ID_INVALID) {
-+					if (i == 0 && port->external != SPA_ID_INVALID) {
- 						pw_log_error("output port %s[%d]:%s already used as output %d, use copy",
- 							port->node->name, i, d->PortNames[port->p],
--							graph->n_output);
-+							port->external);
- 						res = -EBUSY;
- 						goto error;
- 					}
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
index bb107435cdd8..87ab20765488 100644
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ b/srcpkgs/pipewire/patches/autostart-media-session.patch
@@ -2,14 +2,14 @@ Upstream's config does not autostart pipewire-media-session anymore, which
 is an essential component. It's not easy to start it externally in a script
 since it needs the pipewire socket up, and Void doesn't have a mechanism to
 ensure it (systemd socket activation).
---- a/src/daemon/pipewire.conf.in	2021-03-18 17:45:02.025992827 +0100
-+++ b/src/daemon/pipewire.conf.in	2021-03-18 17:47:17.606999440 +0100
-@@ -204,7 +204,7 @@
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -234,7 +234,7 @@
      # but it is better to start it as a systemd service.
      # Run the session manager with -h for options.
      #
--    @comment@{ path = "@media_session_path@"  args = "" }
-+    { path = "@media_session_path@"  args = "" }
+-    @comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
++    { path = "@session_manager_path@"  args = "@session_manager_args@" }
      #
      # You can optionally start the pulseaudio-server here as well
      # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 43e3c1cfc9b4..6bf7f6f0a914 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,24 +1,26 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.28
+version=0.3.31
 revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
  -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
- -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d"
+ -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
- libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
+ libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
 short_desc="Server and user space API to deal with multimedia pipelines"
-maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
+maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=1d9271e121a5049aef379e9bb7c50524faa6f971e668806637d7b9df1b7cab88
+checksum=2fec0eb47dbfcad51fb8bb3d59c26fe57e09204d63c9d2776070dbdc08aaaaae
+make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
+system_accounts="_pipewire"
 
 build_options="sdl2"
 
@@ -36,6 +38,8 @@ fi
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
+	vsv pipewire
+	vsv pipewire-pulse
 }
 
 libpipewire_package() {
@@ -150,6 +154,7 @@ libjack-pipewire_package() {
 	pkg_install() {
 		vmove usr/lib/pipewire-0.3/jack
 		vmove usr/bin/pw-jack
+		vmove usr/share/man/man1/pw-jack.1
 	}
 }
 

From fdf2d2aecc95b7a9f01ef016b1936e9bc3cb8621 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 12 Jul 2021 17:19:58 +0200
Subject: [PATCH 16/28] stubby: update to 0.4.0.

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

diff --git a/srcpkgs/stubby/template b/srcpkgs/stubby/template
index b845b966cb87..7eaaf5e46170 100644
--- a/srcpkgs/stubby/template
+++ b/srcpkgs/stubby/template
@@ -1,10 +1,10 @@
 # Template file for 'stubby'
 pkgname=stubby
-version=0.3.0
+version=0.4.0
 revision=1
 build_style=cmake
 conf_files="/etc/stubby/stubby.yml"
-makedepends="getdns-devel libyaml-devel"
+makedepends="getdns-devel libyaml-devel openssl-devel"
 depends="libcap-progs"	# For setcap(8)
 short_desc="DNS Privacy stub resolver"
 maintainer="Frank Steinborn <steinex@nognu.de>"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/getdnsapi/stubby"
 changelog="https://raw.githubusercontent.com/getdnsapi/stubby/v${version}/ChangeLog"
 distfiles="https://github.com/getdnsapi/stubby/archive/v${version}.tar.gz"
-checksum=b37a0e0ec2b7cfcdcb596066a6fd6109e91a2766b17a42c47d3703d9be41d000
+checksum=8e6a4ba76f04b23612d58813c4998141b0cc6194432d87f8653f3ba5cf64152a
 
 # Create stubby system user/group
 system_accounts="_${pkgname}"

From 1d06d9fce750bfebdd29fd3074a400cc609b98d4 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 12 Jul 2021 17:26:58 +0200
Subject: [PATCH 17/28] getdns: update to 1.7.0.

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

diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index c2ddfde9fbc7..67672e19ff30 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,17 +1,18 @@
 # Template file for 'getdns'
 pkgname=getdns
-version=1.5.1
-revision=7
-build_style=gnu-configure
-configure_args="--with-libev --with-libevent --with-libuv
- --with-ssl=${XBPS_CROSS_BASE}/usr"
-makedepends="libev-devel libidn-devel libuv-devel unbound-devel"
+version=1.7.0
+revision=1
+build_style=cmake
+makedepends="libev-devel libidn-devel libuv-devel unbound-devel
+ check-devel libidn2-devel"
 short_desc="Modern asynchronous DNS API"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://getdnsapi.net"
 distfiles="https://getdnsapi.net/dist/getdns-${version}.tar.gz"
-checksum=5686e61100599c309ce03535f9899a5a3d94a82cc08d10718e2cd73ad3dc28af
+checksum=ea8713ce5e077ac76b1418ceb6afd25e6d4e39e9600f6f5e81d3a3a13a60f652
+# GitHub Actions fail due to no IPv6
+make_check=ci-skip
 
 post_install() {
 	vlicense LICENSE

From 0b3a58fd2e27191e2b9f986a26d3c27588142bb1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 11 Jul 2021 21:22:11 +0700
Subject: [PATCH 18/28] kdenlive: update to 21.04.3

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

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 6914d3318b38..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=20.12.3
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -9,16 +9,15 @@ hostmakedepends="
 makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
  kplotting-devel mlt-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
- v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel"
-depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols
- qt5-quickcontrols2 vlc"
+ v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
+depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d9f94699befc59b0a410d99dcafd445f33126678c18d859df4fceb553a88586
+checksum=754fae49644afbc8ecc0f5a4d579f09738f189a7626c99f862e5e4cdb6426df1
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From b1d2e690a06d81b9597e32985473f178bf3df36c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 12 Jul 2021 10:11:12 +0300
Subject: [PATCH 19/28] bumblebee-status: update to 2.1.4.

---
 srcpkgs/bumblebee-status/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index 96914a6acd4f..786c1b0663c1 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -1,24 +1,31 @@
 # Template file for 'bumblebee-status'
 pkgname=bumblebee-status
-version=2.1.2
+version=2.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-psutil python3-requests"
+checkdepends="python3-pytest python3-pytest-mock python3-freezegun $depends"
 short_desc="Modular, theme-able status line generator for the i3 window manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tobi-wan-kenobi/bumblebee-status"
 distfiles="$PYPI_SITE/b/bumblebee-status/bumblebee-status-$version.tar.gz
  https://raw.githubusercontent.com/tobi-wan-kenobi/bumblebee-status/v$version/LICENSE"
-checksum="c0cfd4e795c12a11d37eabb2801dc9e295af92faf3d0eef8a65b8bb7ea8492c2
+checksum="8dcd8ae54b1d66a2b337c1197014dcd32d83134d4699a0cae028bd5da777fa71
  7cf86a994584e9e1bfe64c63f4e4b9d9bf757148d7ee2af960a267e79b16eab3"
 skip_extraction=LICENSE
 
+do_check() {
+	# fail on musl due to lack of locales
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		python3 -m pytest -k "not test_date and not test_time"
+	else
+		python3 -m pytest
+	fi
+}
+
 post_patch() {
-	vsed -i '
-		s|os.path.*THEME_BASE_DIR.*|"/usr/share/bumblebee-status/themes",|
-	' bumblebee_status/core/theme.py
 	vsed -i '/usr.share.bumblebee-status/s/bin/utility/' bumblebee_status/discover.py
 }
 

From 40bead3525843b3ce0aab578ea1e4c3f5b6199f4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 18 May 2021 09:01:16 +0200
Subject: [PATCH 20/28] python3-pycodestyle: update to 2.7.0

* adopt
* drop python-pycodestyle
* fix tests
---
 srcpkgs/python-pycodestyle                    |  1 +
 srcpkgs/python-pycodestyle/template           | 30 ---------------
 srcpkgs/python3-pycodestyle                   |  1 -
 srcpkgs/python3-pycodestyle/template          | 37 +++++++++++++++++++
 .../update                                    |  0
 5 files changed, 38 insertions(+), 31 deletions(-)
 create mode 120000 srcpkgs/python-pycodestyle
 delete mode 100644 srcpkgs/python-pycodestyle/template
 delete mode 120000 srcpkgs/python3-pycodestyle
 create mode 100644 srcpkgs/python3-pycodestyle/template
 rename srcpkgs/{python-pycodestyle => python3-pycodestyle}/update (100%)

diff --git a/srcpkgs/python-pycodestyle b/srcpkgs/python-pycodestyle
new file mode 120000
index 000000000000..d970ab6f8dc3
--- /dev/null
+++ b/srcpkgs/python-pycodestyle
@@ -0,0 +1 @@
+python3-pycodestyle
\ No newline at end of file
diff --git a/srcpkgs/python-pycodestyle/template b/srcpkgs/python-pycodestyle/template
deleted file mode 100644
index 157a5d5f9fc1..000000000000
--- a/srcpkgs/python-pycodestyle/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-pycodestyle'
-pkgname=python-pycodestyle
-version=2.6.0
-revision=3
-wrksrc="pycodestyle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 style guide checker (formerly called pep8)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/PyCQA/pycodestyle"
-distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
-checksum=c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e
-alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pycodestyle_package() {
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pycodestyle:pycodestyle:/usr/bin/pycodestyle3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pycodestyle b/srcpkgs/python3-pycodestyle
deleted file mode 120000
index f253ce6d35f8..000000000000
--- a/srcpkgs/python3-pycodestyle
+++ /dev/null
@@ -1 +0,0 @@
-python-pycodestyle
\ No newline at end of file
diff --git a/srcpkgs/python3-pycodestyle/template b/srcpkgs/python3-pycodestyle/template
new file mode 100644
index 000000000000..8fafc98015d4
--- /dev/null
+++ b/srcpkgs/python3-pycodestyle/template
@@ -0,0 +1,37 @@
+# Template file for 'python3-pycodestyle'
+pkgname=python3-pycodestyle
+version=2.7.0
+revision=1
+wrksrc="pycodestyle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python style guide checker (formerly called pep8)"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://github.com/PyCQA/pycodestyle"
+distfiles="${PYPI_SITE}/p/pycodestyle/pycodestyle-${version}.tar.gz"
+checksum=c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef
+
+do_check() {
+	# from tox.ini and alpine
+	python3 -m pycodestyle --statistics pycodestyle.py
+	python3 -m pycodestyle --max-doc-length=72 --testsuite testsuite
+	python3 -m pycodestyle --max-doc-length=72 --doctest
+	python3 -m unittest discover testsuite -vv
+
+	python -m pycodestyle --statistics pycodestyle.py
+	python -m pycodestyle --max-doc-length=72 --testsuite testsuite
+	python -m pycodestyle --max-doc-length=72 --doctest
+	python -m unittest discover testsuite -vv
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+python-pycodestyle_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="python3-pycodestyle>=${version}_${revision}"
+}
diff --git a/srcpkgs/python-pycodestyle/update b/srcpkgs/python3-pycodestyle/update
similarity index 100%
rename from srcpkgs/python-pycodestyle/update
rename to srcpkgs/python3-pycodestyle/update

From aab92524df627b1952bdbbb4ca0795e6560b3348 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 18 May 2021 09:06:35 +0200
Subject: [PATCH 21/28] python3-mccabe: run tests, adopt

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

diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
index 8f7efe4d78f3..a95ed189baa4 100644
--- a/srcpkgs/python3-mccabe/template
+++ b/srcpkgs/python3-mccabe/template
@@ -6,8 +6,9 @@ wrksrc="mccabe-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="McCabe complexity checker for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek>"
 license="MIT"
 homepage="https://github.com/PyCQA/mccabe"
 distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
@@ -17,6 +18,7 @@ replaces="mccabe>=0"
 pre_build() {
 	vsed -i '/setup_requires=/d' setup.py
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 1b5bf753cf37869b81b59035ef0eedd44ad0cb10 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Apr 2021 17:25:21 +0200
Subject: [PATCH 22/28] python3-pyflakes: update to 2.3.1

* adopt
---
 srcpkgs/python3-pyflakes/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
index f0a017a14bb4..4df551fa236e 100644
--- a/srcpkgs/python3-pyflakes/template
+++ b/srcpkgs/python3-pyflakes/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-pyflakes'
 pkgname=python3-pyflakes
-version=2.2.0
-revision=3
+version=2.3.1
+revision=1
 wrksrc="pyflakes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3"
 short_desc="Passive checker of Python programs (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/pyflakes"
 distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
-checksum=35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8
+checksum=f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db
 conflicts="python-pyflakes>=0"
 
 post_install() {

From 07b7d60179849f05b355a74ab320737518eeae22 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 5 Jul 2021 21:27:02 +0200
Subject: [PATCH 23/28] flake8: update to 3.9.2

* remove python3-entrypoints dependency (not necessary since 3.8.0)
* remove version restrictions on runtime dependencies
* fix tests
* adopt
---
 srcpkgs/flake8/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 8a7d34b0e81b..5b5d795f7410 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,22 +1,26 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=3.8.4
+version=3.9.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-pycodestyle>=2.6.0<2.7.0
- python3-pyflakes>=2.2.0<2.3.0 python3-mccabe>=0.6.0<0.7.0
- python3-entrypoints>=0.3<0.4"
-checkdepends="python3-mock python3-pycodestyle python3-pytest python3-pyflakes"
+depends="python3-pycodestyle python3-pyflakes python3-mccabe"
+checkdepends="$depends python3-mock python3-pytest"
 short_desc="Modular source code checker: pycodestyle, pyflakes, mccabe"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://gitlab.com/pycqa/flake8"
+changelog="https://raw.githubusercontent.com/PyCQA/flake8/master/docs/source/release-notes/$version.rst"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b
+checksum=07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b
 
 do_check() {
-	PYTHONPATH="${wrksrc}/src" python3 -m pytest
+	# from alpine
+	PYTHONPATH=build/lib python3 -m pytest \
+			--deselect=tests/integration/test_api_legacy.py::test_legacy_api \
+			--deselect=tests/integration/test_main.py \
+			--deselect=tests/integration/test_plugins.py \
+			--deselect=tests/unit/test_setuptools_command.py::test_package_files_removes_submodules
 }
 
 post_install() {

From 1dcd04ad56c9683f361ff59f62b44c3773fe089f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Jul 2021 15:27:44 +0200
Subject: [PATCH 24/28] pounce: update to 2.4.

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

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 4e33113d349b..1419b7c21b95 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,14 +1,15 @@
 # Template file for 'pounce'
 pkgname=pounce
-version=2.3
-revision=2
+version=2.4
+revision=1
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
 makedepends="libtls-devel"
+depends="openssl"
 short_desc="Multi-client, TLS-only IRC bouncer"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/pounce/"
 distfiles="https://git.causal.agency/pounce/snapshot/pounce-$version.tar.gz"
-checksum=47e77cf01ccd94c6ecb83410d7f832426de61e28573b7aa4ac60fec5ac3f468b
+checksum=0fe406700a80798eb669db90bef73cc4a644a29a2a36ea7178fed73623050a21

From a813053e66b96df859bf887f99eddf2120e6740d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Apr 2021 13:24:00 +0200
Subject: [PATCH 25/28] New package: newsflash-1.4.2.

---
 srcpkgs/newsflash/template | 22 ++++++++++++++++++++++
 srcpkgs/newsflash/update   |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/newsflash/template
 create mode 100644 srcpkgs/newsflash/update

diff --git a/srcpkgs/newsflash/template b/srcpkgs/newsflash/template
new file mode 100644
index 000000000000..86eb40732b9f
--- /dev/null
+++ b/srcpkgs/newsflash/template
@@ -0,0 +1,22 @@
+# Template file for 'newsflash'
+pkgname=newsflash
+version=1.4.2
+revision=1
+wrksrc="news_flash_gtk-$version"
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config glib-devel sqlite-devel gettext"
+makedepends="rust-std webkit2gtk-devel libhandy1-devel openssl-devel"
+short_desc="RSS feed reader that supports various web based services"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/news-flash/news_flash_gtk"
+distfiles="https://gitlab.com/news-flash/news_flash_gtk/-/archive/$version/news_flash_gtk-$version.tar.gz"
+checksum=099318a6bc57e5e695352b2f3c7dd149c9b889f39cb9cbd58dc3f10f41d4948d
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i build-aux/cargo.sh \
+			-e 's,"$CARGO_TARGET_DIR"/,&${RUST_TARGET}/,'
+	fi
+}
diff --git a/srcpkgs/newsflash/update b/srcpkgs/newsflash/update
new file mode 100644
index 000000000000..4b3f40f9365f
--- /dev/null
+++ b/srcpkgs/newsflash/update
@@ -0,0 +1 @@
+pkgname=news_flash_gtk

From d2a16e775e40069aedc3cceb1dd7c8cd34e1c39b Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 10 Jul 2021 03:11:18 +0200
Subject: [PATCH 26/28] gummiboot: split *.efi.stub into subpackage

dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from
gummiboot (or systemd, which is the same; systemd has absorbed
gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable
- and only the stub, not gummiboot bootloader itself, nor any hooks.
---
 srcpkgs/gummiboot-efistub  |  1 +
 srcpkgs/gummiboot/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/gummiboot-efistub

diff --git a/srcpkgs/gummiboot-efistub b/srcpkgs/gummiboot-efistub
new file mode 120000
index 000000000000..9d6464eecfc3
--- /dev/null
+++ b/srcpkgs/gummiboot-efistub
@@ -0,0 +1 @@
+gummiboot
\ No newline at end of file
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 68e6f5be926c..6ab40528e75e 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,12 +1,13 @@
 # Template file for 'gummiboot'
 pkgname=gummiboot
 version=48.1
-revision=7
+revision=8
 archs="i686* x86_64* aarch64*"
 build_style=gnu-configure
 conf_files="/etc/default/gummiboot"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
+depends="${pkgname}-efistub>=${version}_${revision}"
 short_desc="Simple UEFI Boot Manager"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.0-or-later"
@@ -34,3 +35,11 @@ post_install() {
 	vinstall ${FILESDIR}/kernel.d/gummiboot.confd 644 \
 		etc/default gummiboot
 }
+
+gummiboot-efistub_package() {
+	short_desc="Linux UEFI stub from the gummiboot project"
+
+	pkg_install() {
+		vmove "usr/lib/gummiboot/*.efi.stub"
+	}
+}

From d5416d3ac4967e44e9213f74dd1139fda1934893 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 12 Jul 2021 12:35:01 +0200
Subject: [PATCH 27/28] dracut-uefi: replace gummiboot with gummiboot-efistub

dracut-uefi needs only UEFI stub file from gummiboot.
---
 srcpkgs/dracut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index c8db2195c8a0..d3b6c6616722 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=053
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -55,7 +55,7 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot ${sourcepkg}>=${version}_${revision}"
+	depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"
 

From 4213184ee1d67e2f8d443340767e07704b2bd062 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Wed, 14 Jul 2021 15:33:17 +0000
Subject: [PATCH 28/28] endless-sky:update to 0.9.14 changlog added

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

diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index 30019f5e8510..77eede0211e9 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -9,6 +9,7 @@ short_desc="Space exploring, trading, and combat game"
 maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://endless-sky.github.io/"
+changelog=https://raw.githubusercontent.com/endless-sky/endless-sky/master/changelog
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
 checksum=6c22571b5398a18297aa7410890c319b5cb292a833889b4e7c0cd94d831f29af
 replaces="endless-sky-data>=0"