Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: fiss-0.1.1
@ 2023-04-30  0:08 friedelschoen
  2023-05-07 23:13 ` [PR PATCH] [Updated] " friedelschoen
  2023-05-07 23:16 ` [PR PATCH] [Closed]: " friedelschoen
  0 siblings, 2 replies; 6+ messages in thread
From: friedelschoen @ 2023-04-30  0:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/friedelschoen/void-packages master
https://github.com/void-linux/void-packages/pull/43676

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

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 043af249e45f0237966766ed6495c9251048adc2 Mon Sep 17 00:00:00 2001
From: Friedel Schon <derfriedmundschoen@gmail.com>
Date: Sun, 30 Apr 2023 02:03:46 +0200
Subject: [PATCH] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
new file mode 100644
index 000000000000..e237ff5e4ee3
--- /dev/null
+++ b/srcpkgs/fiss/template
@@ -0,0 +1,28 @@
+# Template file for 'fiss'
+pkgname=fiss
+version=0.1.1
+revision=1
+short_desc="Friedel's Initialization and Service Supervision"
+maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
+license="Zlib"
+homepage="https://github.com/friedelschoen/fiss"
+distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
+checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+
+do_build() {
+	make all
+
+	rm -r etc/service.d/agetty-*
+}
+
+do_install() {
+	vlicense LICENSE
+
+	vcopy usr /
+	vcopy etc /
+	vcopy bin /usr
+
+	for f in man/*; do
+		vman $f
+	done
+}

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

* Re: [PR PATCH] [Updated] New package: fiss-0.1.1
  2023-04-30  0:08 [PR PATCH] New package: fiss-0.1.1 friedelschoen
@ 2023-05-07 23:13 ` friedelschoen
  2023-05-07 23:16 ` [PR PATCH] [Closed]: " friedelschoen
  1 sibling, 0 replies; 6+ messages in thread
From: friedelschoen @ 2023-05-07 23:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/friedelschoen/void-packages master
https://github.com/void-linux/void-packages/pull/43676

New package: fiss-0.1.1
#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 043af249e45f0237966766ed6495c9251048adc2 Mon Sep 17 00:00:00 2001
From: Friedel Schon <derfriedmundschoen@gmail.com>
Date: Sun, 30 Apr 2023 02:03:46 +0200
Subject: [PATCH 001/153] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
new file mode 100644
index 000000000000..e237ff5e4ee3
--- /dev/null
+++ b/srcpkgs/fiss/template
@@ -0,0 +1,28 @@
+# Template file for 'fiss'
+pkgname=fiss
+version=0.1.1
+revision=1
+short_desc="Friedel's Initialization and Service Supervision"
+maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
+license="Zlib"
+homepage="https://github.com/friedelschoen/fiss"
+distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
+checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+
+do_build() {
+	make all
+
+	rm -r etc/service.d/agetty-*
+}
+
+do_install() {
+	vlicense LICENSE
+
+	vcopy usr /
+	vcopy etc /
+	vcopy bin /usr
+
+	for f in man/*; do
+		vman $f
+	done
+}

From 1a44337a2baa0e9ba9b7885e7414d5adbf7311cb Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Thu, 27 Apr 2023 11:09:03 -0400
Subject: [PATCH 002/153] disklow: workaround distfiles cert error.

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

diff --git a/srcpkgs/disklow/template b/srcpkgs/disklow/template
index 1e0ccd108ffc..b5e9aae8efb2 100644
--- a/srcpkgs/disklow/template
+++ b/srcpkgs/disklow/template
@@ -1,7 +1,7 @@
 # Template file for 'disklow'
 pkgname=disklow
 version=1.2
-revision=1
+revision=2
 depends="perl-Filesys-Df perl-Config-General perl-Mail-Sendmail
  perl-Net-SMTP-SSL perl-Authen-SASL"
 short_desc="Fine grained disk space reporting with emphasis on mail functionality"
@@ -11,6 +11,9 @@ homepage="https://loomsday.co.nz/development?id=linuxutils"
 distfiles="https://loomsday.co.nz/sources/disklow-${version}.tar.gz"
 checksum=05b9f510278147f24b0556eb745ff2b71c98c00fedf33434744fbe76ec884c26
 
+# xbps-fetch cannot verify this cert
+fetch_cmd="env SSL_NO_VERIFY_PEER=1 $XBPS_FETCH_CMD"
+
 do_install() {
 	vbin  disklow
 	vconf disklow.conf

From aec4a4fb821b72f673a9274496933d1adccb2d35 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 29 Apr 2023 17:48:01 +0200
Subject: [PATCH 003/153] proj: update to 9.2.0.

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

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 070a6282f0b0..f69c53e4ac8c 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,7 +1,7 @@
 # Template file for 'proj'
 pkgname=proj
-version=9.1.1
-revision=2
+version=9.2.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39
+checksum=dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e
 
 post_install() {
 	vlicense COPYING

From 4e5677cc16b20301d8bf821ea4d92a23926441b8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 29 Apr 2023 16:37:45 +0200
Subject: [PATCH 004/153] restic: update to 0.15.2.

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

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 91676a7f750b..819af7d6ffcb 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.15.1
-revision=2
+version=0.15.2
+revision=1
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=fce382fdcdac0158a35daa640766d5e8a6e7b342ae2b0b84f2aacdff13990c52
+checksum=52aca841486eaf4fe6422b059aa05bbf20db94b957de1d3fca019ed2af8192b7
 
 post_install() {
 	vlicense LICENSE

From cc1dadb00fd7294571dce28f138147b66b40c7e5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 29 Apr 2023 17:04:22 +0300
Subject: [PATCH 005/153] python3-attrs: update to 23.1.0.

---
 .../remove-hatch-fancy-pypi-readme-dep.diff   | 64 +++++++++++++++++++
 srcpkgs/python3-attrs/template                |  8 +--
 2 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-attrs/patches/remove-hatch-fancy-pypi-readme-dep.diff

diff --git a/srcpkgs/python3-attrs/patches/remove-hatch-fancy-pypi-readme-dep.diff b/srcpkgs/python3-attrs/patches/remove-hatch-fancy-pypi-readme-dep.diff
new file mode 100644
index 000000000000..6133fece1187
--- /dev/null
+++ b/srcpkgs/python3-attrs/patches/remove-hatch-fancy-pypi-readme-dep.diff
@@ -0,0 +1,64 @@
+--- a/pyproject.toml	2023-04-16 13:22:15.000000000 +0300
++++ b/pyproject.toml	2023-04-29 16:49:08.704873775 +0300
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: MIT
+ 
+ [build-system]
+-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"]
++requires = ["hatchling", "hatch-vcs"]
+ build-backend = "hatchling.build"
+ 
+ 
+@@ -75,52 +75,6 @@
+ [tool.hatch.build.targets.wheel]
+ packages = ["src/attr", "src/attrs"]
+ 
+-[tool.hatch.metadata.hooks.fancy-pypi-readme]
+-content-type = "text/markdown"
+-
+-# PyPI doesn't support the <picture> tag.
+-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+-text = """<p align="center">
+-  <a href="https://www.attrs.org/">
+-    <img src="https://raw.githubusercontent.com/python-attrs/attrs/main/docs/_static/attrs_logo.svg" width="35%" alt="attrs" />
+-  </a>
+-</p>
+-"""
+-
+-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+-path = "README.md"
+-start-after = "<!-- teaser-begin -->"
+-
+-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+-text = """
+-
+-## Release Information
+-
+-"""
+-
+-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+-path = "CHANGELOG.md"
+-pattern = "\n(###.+?\n)## "
+-
+-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+-text = """
+-
+----
+-
+-[Full changelog](https://www.attrs.org/en/stable/changelog.html)
+-"""
+-
+-
+-# Make coverage play nicely with pytest-xdist.
+-[tool.hatch.build.targets.wheel.hooks.autorun]
+-dependencies = ["hatch-autorun"]
+-code = """
+-import coverage
+-coverage.process_startup()
+-"""
+-enable-by-default = false
+-
+-
+ [tool.pytest.ini_options]
+ addopts = ["-ra", "--strict-markers", "--strict-config"]
+ xfail_strict = true
diff --git a/srcpkgs/python3-attrs/template b/srcpkgs/python3-attrs/template
index 242c92649d92..492d33f8fe23 100644
--- a/srcpkgs/python3-attrs/template
+++ b/srcpkgs/python3-attrs/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-attrs'
 pkgname=python3-attrs
-version=22.2.0
+version=23.1.0
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools hatch-vcs"
 depends="python3"
 checkdepends="python3-pytest python3-zope.interface python3-six
  python3-hypothesis"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://attrs.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/python-attrs/attrs/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99
+checksum=6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
 
 post_install() {
 	vlicense LICENSE

From 6b7765f60c3a5b40233c5c37f9546a35ff6ca0f5 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Sat, 29 Apr 2023 16:03:46 +0200
Subject: [PATCH 006/153] hplip: update to 3.23.3

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

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 0d9cd0b87ec1..9c996610408d 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 # When possible, keep this package in sync with hplip-plugin
 pkgname=hplip
-version=3.22.10
+version=3.23.3
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
@@ -34,7 +34,7 @@ license="GPL-2.0-only, BSD-3-Clause, MIT"
 homepage="https://developers.hp.com/hp-linux-imaging-and-printing"
 changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
 distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz"
-checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
+checksum=e4260a98a2b1d88d21e82562de419aa21c95bc9e2ace3583346a80fd217e07b6
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
 

From dcbf2b7a09fc0710e38ec643e317fa25270b6f6b Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Thu, 27 Apr 2023 23:00:58 +0900
Subject: [PATCH 007/153] xsel: update to 1.2.1.

---
 srcpkgs/xsel/patches/strncpy.patch | 13 -------------
 srcpkgs/xsel/template              | 13 +++++++++----
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/xsel/patches/strncpy.patch

diff --git a/srcpkgs/xsel/patches/strncpy.patch b/srcpkgs/xsel/patches/strncpy.patch
deleted file mode 100644
index fc08b667b012..000000000000
--- a/srcpkgs/xsel/patches/strncpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git xsel.c xsel.c
-index 79cc68b..556585e 100644
---- a/xsel.c
-+++ b/xsel.c
-@@ -1983,7 +1983,7 @@ main(int argc, char *argv[])
-       dont_output = True;
-     } else if (OPT("--logfile") || OPT("-l")) {
-       i++; if (i >= argc) goto usage_err;
--      strncpy (logfile, argv[i], MAXFNAME);
-+      strncpy (logfile, argv[i], MAXFNAME-1);
-     } else {
-       goto usage_err;
-     }
diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template
index d83385cdcbe2..d3a5aacdb0ff 100644
--- a/srcpkgs/xsel/template
+++ b/srcpkgs/xsel/template
@@ -1,16 +1,21 @@
 # Template file for 'xsel'
 pkgname=xsel
-version=1.2.0
-revision=5
+version=1.2.1
+revision=1
 build_style="gnu-configure"
+hostmakedepends="autoconf automake pkg-config"
 makedepends="libXt-devel"
 short_desc="Command-line getting and setting the contents of the X selection"
 maintainer="Steven R <dev@styez.com>"
 license="HPND-sell-variant"
 homepage="http://www.kfish.org/software/xsel/"
 changelog="https://raw.githubusercontent.com/kfish/xsel/master/release_notes/xsel-${version}.txt"
-distfiles="http://www.kfish.org/software/xsel/download/xsel-${version}.tar.gz"
-checksum=b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c
+distfiles="https://github.com/kfish/xsel/archive/refs/tags/${version}.tar.gz"
+checksum=18487761f5ca626a036d65ef2db8ad9923bf61685e06e7533676c56d7d60eb14
+
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	vlicense COPYING LICENSE

From 98534284e93f67819d9585405365e02589bfa734 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 28 Apr 2023 23:44:37 +0300
Subject: [PATCH 008/153] libgusb: update to 0.4.5.

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

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 6860869a82c9..80663c38a5ff 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.10
+version=0.4.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,14 +8,14 @@ configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)
  -Dvapi=$(vopt_if vala true false)"
 hostmakedepends="pkg-config $(vopt_if vala vala)"
 makedepends="libglib-devel libusb-devel libgudev-devel $(vopt_if vala vala-devel)
- usbutils"
+ usbutils json-glib-devel"
 short_desc="GLib wrapper around libusb1"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
-distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
-checksum=0eb0b9ab0f8bba0c59631c809c37b616ef34eb3c8e000b0b9b71cf11e4931bdc
+distfiles="https://github.com/hughsie/libgusb/releases/download/${version}/libgusb-${version}.tar.xz"
+checksum=bc8c6328289f057c8f73b07c1ba6251de96029787309f2672ca252ca90ace1b2
 # requires access to USB devices, not available on CI
 make_check=ci-skip
 

From e9d9316dd7d783678923c20e84df51f3db20cadc Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 29 Apr 2023 02:04:52 +0530
Subject: [PATCH 009/153] rsClock: update to 0.1.9.

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

diff --git a/srcpkgs/rsClock/template b/srcpkgs/rsClock/template
index f46d7805942f..abab336ad947 100644
--- a/srcpkgs/rsClock/template
+++ b/srcpkgs/rsClock/template
@@ -1,14 +1,15 @@
 # Template file for 'rsClock'
 pkgname=rsClock
-version=0.1.7
+version=0.1.9
 revision=1
 build_style=cargo
 short_desc="Simple terminal clock written in Rust"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="MIT"
 homepage="https://github.com/valebes/rsClock"
-distfiles="https://github.com/valebes/rsClock/archive/refs/tags/v.${version}.tar.gz"
-checksum=60852e63e02629208919e2cd0bc0ba3a4d9e7b26af3b983f1141c507de1a411e
+changelog="https://github.com/valebes/rsClock/releases"
+distfiles="https://github.com/valebes/rsClock/archive/refs/tags/v${version}.tar.gz"
+checksum=1535a9e317e7434bae31ab526ccfa1086ae58fb395db799a3b414332ce08418c
 
 post_install() {
 	vlicense LICENSE

From 41341043e166cf432e5420880db4406aee9d63d4 Mon Sep 17 00:00:00 2001
From: Massimo Manzato <massimo.manzato@gmail.com>
Date: Fri, 28 Apr 2023 17:39:42 +0200
Subject: [PATCH 010/153] libvterm: update to 0.3.1

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

diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index ef8a8c655f7e..a7a7042e0e23 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,6 +1,6 @@
 # Template file for 'libvterm'
 pkgname=libvterm
-version=0.3
+version=0.3.1
 revision=1
 build_style=gnu-makefile
 make_install_target="install-lib install-inc"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.leonerd.org.uk/code/libvterm"
 distfiles="https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"
-checksum=61eb0d6628c52bdf02900dfd4468aa86a1a7125228bab8a67328981887483358
+checksum=25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397
 
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then

From c352acec212dcd5cfd7e5abbdca674e9aa051eb0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 29 Apr 2023 02:01:59 +0530
Subject: [PATCH 011/153] vale: update to 2.25.2.

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

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 936146fdce89..d0853cba7904 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.24.4
+version=2.25.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://vale.sh"
 changelog="https://github.com/errata-ai/vale/releases"
 distfiles="https://github.com/errata-ai/vale/archive/refs/tags/v${version}.tar.gz"
-checksum=3363aca630175e06f6490327ac28d10104a320b2360b49d5221779df0df84500
+checksum=a85aa7012bf058185f2d66dd96bc594b80303ebb56dd42add8f6fe3c948f2677
 
 post_install() {
 	vlicense LICENSE

From 1fb31f5a07bebce46d1b9ba284d03d2d54e39b87 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 26 Apr 2023 10:47:09 -0500
Subject: [PATCH 012/153] nvidia: update to 525.116.03.

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index eb0cc5a74cb7..b7cee3debc25 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=525.105.17
+version=525.116.03
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=c635a21a282c9b53485f19ebb64a0f4b536a968b94d4d97629e0bc547a58142a
+checksum=5c295b02ebec2e9a9ec0d79ba9292eb623b4b2fbba8a6ed619060929a30d0469
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From eecf05fcc1322245b6c152af466a510f5b9e1e19 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sat, 29 Apr 2023 01:04:25 -0500
Subject: [PATCH 013/153] nextcloud-client: update to 3.8.1.

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

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 0fa40780a545..27502262b8fa 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,6 +1,6 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.8.0
+version=3.8.1
 revision=1
 build_style=cmake
 configure_args="-Wno-dev"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=612a604522693082ce30405655430079122b76ac74c277dfbb3e5a62a23953f4
+checksum=f919a09c261039ddb8fcb6c10f10b1c6a8a31f64bf9b8b14ff46b5d02e428afc
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 

From d763e2a0c0ee903e597c70cfdbfc61bd211f3375 Mon Sep 17 00:00:00 2001
From: Ananteris <ananteris@protonmail.ch>
Date: Fri, 28 Apr 2023 11:10:39 +0200
Subject: [PATCH 014/153] python3-openai: update to 0.27.5.

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

diff --git a/srcpkgs/python3-openai/template b/srcpkgs/python3-openai/template
index 3133a73583d8..22adf52a0000 100644
--- a/srcpkgs/python3-openai/template
+++ b/srcpkgs/python3-openai/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-openai'
 pkgname=python3-openai
-version=0.25.0
+version=0.27.5
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -10,7 +10,7 @@ maintainer="Ananteris <ananteris@protonmail.ch>"
 license="MIT"
 homepage="https://github.com/openai/openai-python"
 distfiles="https://github.com/openai/openai-python/archive/refs/tags/v${version}.tar.gz"
-checksum="422a42368b0264ebcd9914e0b38004b2c441a69ea7f3a059d6afe84b770f8553"
+checksum="549c2dab52a49ee074b13edef672ed872915bf5d8852a2750377937380c45285"
 make_check=extended # Requires valid API key
 
 post_install() {

From ec37aa1ff561e04f6f7c47d24c2f011fc9a3029e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 23 Apr 2023 21:30:56 -0300
Subject: [PATCH 015/153] libmtp: update to 1.1.21.

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

diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index c15fba0f30e0..8f87793b08e4 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'libmtp'
 pkgname=libmtp
-version=1.1.20
+version=1.1.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-udev=/usr/lib/udev
@@ -11,8 +11,9 @@ short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libmtp.sourceforge.net"
+changelog="https://sourceforge.net/projects/libmtp/files/libmtp/${version}/README"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c9191dac2f5744cf402e08641610b271f73ac21a3c802734ec2cedb2c6bc56d0
+checksum=c4ffa5ab8c8f48c91b0047f2e253c101c418d5696a5ed65c839922a4280872a7
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host mtp-hotplug

From 5991f222a357a9c82b8accca4c9a50dcdb001148 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 20 Apr 2023 12:55:11 +0530
Subject: [PATCH 016/153] python3-yapf: update to 0.33.0.

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

diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template
index cbef89025a99..1e8bedc6528b 100644
--- a/srcpkgs/python3-yapf/template
+++ b/srcpkgs/python3-yapf/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-yapf'
 pkgname=python3-yapf
-version=0.32.0
-revision=2
+version=0.33.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3-tomli"
 short_desc="Formatter for Python code"
 maintainer="RinsedSloth <afernandezh@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/yapf"
 changelog="https://raw.githubusercontent.com/google/yapf/main/CHANGELOG"
 distfiles="${PYPI_SITE}/y/yapf/yapf-${version}.tar.gz"
-checksum=a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b
+checksum=da62bdfea3df3673553351e6246abed26d9fe6780e548a5af9e70f6d2b4f5b9a

From 1b4ea707c177fb15e779b67fd3bd3e942e2fac55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 20 Apr 2023 17:58:36 +0200
Subject: [PATCH 017/153] lux: update to 0.18.0.

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

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index 8149d9867886..56820aad82e0 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
-version=0.17.2
-revision=2
+version=0.18.0
+revision=1
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/lux"
 distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz"
-checksum=eaf08b8cdac14504307ae31920d3d094101d901cd390436ca401b3ba1e7a8924
+checksum=e25f2f8f446948902129f23b75a66309628c51aace1589757bc9a3cf42734c8d
 
 post_install() {
 	vlicense LICENSE

From ab6e57657e5bb12de05d7079a62f6cc5bf8d19d2 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Wed, 19 Apr 2023 04:48:29 +0200
Subject: [PATCH 018/153] podget: update to 0.9.1

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

diff --git a/srcpkgs/podget/template b/srcpkgs/podget/template
index 3360e850db37..f2e3261df9e2 100644
--- a/srcpkgs/podget/template
+++ b/srcpkgs/podget/template
@@ -1,6 +1,6 @@
 # Template file for 'podget'
 pkgname=podget
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=gnu-makefile
 depends="wget"
@@ -10,4 +10,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/dvehrs/podget"
 changelog="https://raw.githubusercontent.com/dvehrs/podget/dev/Changelog"
 distfiles="https://github.com/dvehrs/podget/archive/refs/tags/v${version}.tar.gz"
-checksum=0eabb49fc32761b566f8f290e823ad8415e08d743551905130768a98ff8f0a11
+checksum=eaeacc306b989359cbbc33891cf8f4ff9ca940af21e7a409e204b26ccb1d50a7

From 67536d11c230f9b6e8d84e8077f257dae59c7dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 18 Apr 2023 12:04:00 +0100
Subject: [PATCH 019/153] openexr: update to 3.1.7.

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

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 2c2b21b043b5..b15bfb736f72 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,7 +1,7 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.5
-revision=2
+version=3.1.7
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
 changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>openexr-${version}.tar.gz"
-checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
+checksum=78dbca39115a1c526e6728588753955ee75fa7f5bb1a6e238bed5b6d66f91fd7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

From c5d80563721fd2891da5c43435dc0b73d202a79d Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Sat, 29 Apr 2023 20:43:42 -0400
Subject: [PATCH 020/153] diffuse: update to 0.8.2

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

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..f947869f9321 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,9 +1,9 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
-hostmakedepends="gettext"
+hostmakedepends="gettext pkg-config glib-devel"
 makedepends="python3-cairo-devel python3-gobject-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
@@ -11,4 +11,4 @@ maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

From b48a1c2506921a17ecb4d5d88a665bf3398e36e1 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 20 Apr 2023 17:15:09 +0400
Subject: [PATCH 021/153] snappy: update to 1.1.10.

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

diff --git a/srcpkgs/snappy/patches/inline.patch b/srcpkgs/snappy/patches/inline.patch
deleted file mode 100644
index a69dfecaf48f..000000000000
--- a/srcpkgs/snappy/patches/inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to fix:
-1097 |         size_t tag_type = AdvanceToNextTag(&ip, &tag);
-     |                           ~~~~~~~~~~~~~~~~^~~~~~~~~~~
-../snappy.cc:1017:8: error: inlining failed in call to 'always_inline'
-'size_t snappy::AdvanceToNextTag(const uint8_t**, size_t*)': function body can be overwritten at link time
-
---- a/snappy.cc	2021-05-05 02:53:34.000000000 +0400
-+++ b/snappy.cc	2021-05-24 01:24:59.124654893 +0400
-@@ -1017 +1017 @@ SNAPPY_ATTRIBUTE_ALWAYS_INLINE
--size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template
index 7e9e5214fb7d..f85fcac828c6 100644
--- a/srcpkgs/snappy/template
+++ b/srcpkgs/snappy/template
@@ -1,6 +1,6 @@
 # Template file for 'snappy'
 pkgname=snappy
-version=1.1.9
+version=1.1.10
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1"
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://google.github.io/snappy"
 distfiles="https://github.com/google/snappy/archive/${version}.tar.gz"
-checksum=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7
+checksum=49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
 
 post_install() {
 	vlicense COPYING

From 2f36b757a9145682c977447c33dec9bc8ec9ae24 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 24 Apr 2023 09:24:10 +0100
Subject: [PATCH 022/153] v4l-utils: update to 1.24.1.

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

diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template
index bea4fccd0ada..aabfb8de79cf 100644
--- a/srcpkgs/v4l-utils/template
+++ b/srcpkgs/v4l-utils/template
@@ -1,18 +1,19 @@
 # Template file for 'v4l-utils'
 pkgname=v4l-utils
-version=1.22.1
+version=1.24.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-qv4l2 --with-udevdir=/usr/lib/udev"
-hostmakedepends="automake libtool pkg-config gettext-devel"
+hostmakedepends="perl pkg-config gettext-devel"
 makedepends="libjpeg-turbo-devel libsysfs-devel eudev-libudev-devel alsa-lib-devel
  libX11-devel"
 short_desc="Userspace tools and libraries for Video 4 Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://linuxtv.org/"
-distfiles="https://linuxtv.org/downloads/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31
+changelog="https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog"
+distfiles="https://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2"
+checksum=cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b
 conf_files="/etc/rc_maps.cfg"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -24,10 +25,6 @@ esac
 
 CFLAGS+=" -fcommon"
 
-pre_configure() {
-	autoreconf -if
-}
-
 v4l-utils-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 32a16c6317837447ef678359e0fc08587f00f815 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 17 Apr 2023 00:51:58 +0200
Subject: [PATCH 023/153] python3-aiohttp_socks: update to 0.8.0.

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

diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index 4675228d6805..10c8125e0753 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-aiohttp_socks'
 pkgname=python3-aiohttp_socks
-version=0.6.0
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-aiohttp python3-socks"
 checkdepends="python3-aiohttp python3-attrs python3-socks"
 short_desc="SOCKS proxy connector for aiohttp"
@@ -11,4 +11,4 @@ maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="Apache-2.0"
 homepage="https://github.com/romis2012/aiohttp-socks"
 distfiles="${PYPI_SITE}/a/aiohttp_socks/aiohttp_socks-${version}.tar.gz"
-checksum=b95dcfba3740c8499f4ff633846d72108459d25650ebc1ae8b299cb817088013
+checksum=927b1d3b347448f86ff5245c9ca19e40f397eb93906682be592790678c982f37

From 1b9d8cc6c490796517e2708858e664e97c8998cc Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 17 Apr 2023 00:53:49 +0200
Subject: [PATCH 024/153] python3-socks: update to 2.2.0.

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

diff --git a/srcpkgs/python3-socks/template b/srcpkgs/python3-socks/template
index 08fe1500d82d..f79051c99e6f 100644
--- a/srcpkgs/python3-socks/template
+++ b/srcpkgs/python3-socks/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-socks'
 pkgname=python3-socks
-version=1.2.4
-revision=4
+version=2.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-async-timeout python3-curio python3-trio python3-attrs
  python3-async_generator python3-sniffio python3-sortedcontainers
- python3-outcome python3-idna"
+ python3-anyio python3-outcome python3-idna"
 # Optional dependencies:
 # async-timeout >= 3.0.1
 # trio >= 0.16.0
@@ -17,4 +17,4 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/romis2012/python-socks"
 distfiles="${PYPI_SITE}/p/python-socks/python-socks-${version}.tar.gz"
-checksum=7d0ef2578cead9f762b71317d25a6c118fabaf79535555e75b3e102f5158ddd8
+checksum=81500aca769165660cbbf38500849ffbedd50a8c50b6694f5132da3e21c7b30a

From c5d3476eadec0df4f3b34f6723f76ed409d767d1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 17 Apr 2023 00:56:54 +0200
Subject: [PATCH 025/153] python3-outcome: update to 1.2.0.

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

diff --git a/srcpkgs/python3-outcome/template b/srcpkgs/python3-outcome/template
index daabfffe61de..6f6d448dd6b3 100644
--- a/srcpkgs/python3-outcome/template
+++ b/srcpkgs/python3-outcome/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-outcome'
 pkgname=python3-outcome
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -11,7 +11,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/python-trio/outcome"
 distfiles="${PYPI_SITE}/o/outcome/outcome-${version}.tar.gz"
-checksum=e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967
+checksum=6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672
 
 post_install() {
 	vlicense LICENSE

From 8f1e0a1ea0842e404c415120ba0be8e3ac9337ee Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 17 Apr 2023 01:10:19 +0200
Subject: [PATCH 026/153] python3-sniffio: update to 1.3.0.

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

diff --git a/srcpkgs/python3-sniffio/template b/srcpkgs/python3-sniffio/template
index 8015ede3a1ad..7f8f76dba42d 100644
--- a/srcpkgs/python3-sniffio/template
+++ b/srcpkgs/python3-sniffio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sniffio'
 pkgname=python3-sniffio
-version=1.2.0
-revision=3
+version=1.3.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -11,7 +11,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/python-trio/sniffio"
 distfiles="${PYPI_SITE}/s/sniffio/sniffio-${version}.tar.gz"
-checksum=c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de
+checksum=e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101
 
 post_install() {
 	vlicense LICENSE

From 1647c77272238ecc1105c7a9cb5a57a02ff1c599 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Fri, 14 Apr 2023 20:46:26 +0200
Subject: [PATCH 027/153] cpuid: update to 20230406.

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

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 02d90cca2fce..0fd421467072 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20230306
+version=20230406
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,6 +10,6 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.etallen.com/cpuid.html"
 distfiles="https://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=3e5071c5317ad3a58346cfbbdfd7e5a8cb531f7150bf66c931bc4c2ca6fe34eb
+checksum=f4045de535f30e34e8c012b054ce66f40ac399144d6e3c3896bd80c0deeef1b0
 
 conflicts="msr-tools"

From a383ee26db8b5f1b7a1f857e84a42b8cf8b6d28b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 14 Apr 2023 00:40:49 +0530
Subject: [PATCH 028/153] glab: update to 1.28.1.

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

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 77956351468d..3b0657dfaebb 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
 # Template file for 'glab'
 pkgname=glab
-version=1.27.1
+version=1.28.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.com/gitlab-org/cli"
 distfiles="https://gitlab.com/gitlab-org/cli/-/archive/v$version/cli-v$version.tar.gz"
-checksum=c2959152b51c39097607f13d64bcecc04121ab7c52590505ebaa0693c6058507
+checksum=243a0f15e4400aab7b4d27ec71c6ae650bf782473c47520ffccd57af8d939c90
 
 post_install() {
 	for shell in bash fish zsh; do

From 390c79ccfe401988a4f550548ff0239fb41ef995 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 30 Apr 2023 14:29:03 +0200
Subject: [PATCH 029/153] alttab: update to 1.7.1.

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

diff --git a/srcpkgs/alttab/template b/srcpkgs/alttab/template
index f62b9319c219..2152c2dddffc 100644
--- a/srcpkgs/alttab/template
+++ b/srcpkgs/alttab/template
@@ -1,6 +1,6 @@
 # Template file for 'alttab'
 pkgname=alttab
-version=1.7.0
+version=1.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/sagb/alttab"
 changelog="https://github.com/sagb/alttab/raw/master/ChangeLog"
 distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz"
-checksum=9c0e556909eff60996892b03ef12185b7db8d8b915bc3aa628c208908b09dba3
+checksum=0926b12cc0ad9f63a6242ede3b0f9cae6f30f61ccb050740df55bfb6f531f303
 
 make_check=no # needs cnee/xnee which is not packaged
 

From 6e22c9cd3a4aa39cc4e733127192b062d087fced Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 30 Apr 2023 15:03:36 +0200
Subject: [PATCH 030/153] erlang: update to 25.3.1.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 29dbd5f5c8ac..5168e1e7d3ee 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=25.3
+version=25.3.1
 revision=1
 build_style=gnu-configure
 make_install_target="install install-docs"
@@ -12,7 +12,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=f4fc2c5e1da56eb659003015ab80c42e50cef1129cca8c14457a522d1793498d
+checksum=4fafc922e012419205eeea482eb1e8d838377477f39c3ba8fc398d8b69029e14
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 55cd533fba8c24984dfdb49c08802c8bbf9f31aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 30 Apr 2023 16:54:51 +0200
Subject: [PATCH 031/153] libabigail: update to 2.3.

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

diff --git a/srcpkgs/libabigail/template b/srcpkgs/libabigail/template
index 770918e45fb4..4fb610d14738 100644
--- a/srcpkgs/libabigail/template
+++ b/srcpkgs/libabigail/template
@@ -1,6 +1,6 @@
 # Template file for 'libabigail'
 pkgname=libabigail
-version=2.2
+version=2.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-cxx11=yes"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.sourceware.org/libabigail/"
 distfiles="http://mirrors.kernel.org/sourceware/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=764d3d811550fadcca1e86e48a09564d0037a5210f54b24780becfa59095116b
+checksum=bc214c89f3b7ab8f20113a7c7aa40a207d41574d7ec25c2520501420d8019eb0
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl)

From 401c34c69e2e4e0a5e2b508a37c9140a41083e89 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 30 Apr 2023 16:56:38 +0200
Subject: [PATCH 032/153] perl-Parse-PMFile: update to 0.44.

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

diff --git a/srcpkgs/perl-Parse-PMFile/template b/srcpkgs/perl-Parse-PMFile/template
index 626c152e58ab..579fe7e65bbb 100644
--- a/srcpkgs/perl-Parse-PMFile/template
+++ b/srcpkgs/perl-Parse-PMFile/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Parse-PMFile'
 pkgname=perl-Parse-PMFile
-version=0.43
+version=0.44
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-MakeMaker-CPANfile perl-Module-CPANfile"
@@ -11,4 +11,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Parse-PMFile"
 distfiles="${CPAN_SITE}/Parse/Parse-PMFile-${version}.tar.gz"
-checksum=be61e807204738cf0c52ed321551992fdc7fa8faa43ed43ff489d0c269900623
+checksum=e08f0f56455b3ac12dccd8c711650612b7d3cd150f8a6f8ae6b43b2da47df994

From 85974597f73f5f2325ce1964d0d8b508b2d03d3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 30 Apr 2023 17:00:12 +0200
Subject: [PATCH 033/153] perl-WWW-Mechanize: update to 2.17.

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

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index f05ba9adaa8e..db011c01e099 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.16
+version=2.17
 revision=1
 build_style=perl-module
 hostmakedepends="perl-CGI perl-HTML-Form perl-HTML-Tree
@@ -15,4 +15,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=a7b0b4c8947fd72d8727316c8f2d4525bf0865a9f0fd00c0b0eb28af92d1e58a
+checksum=9c02003e84621dea12c980c4101e79e4f8cae4e382cd3da239faa8bd198f063a

From f27919102a4ad3e74ec5a7db91f2c010e8b20e7d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 17 Apr 2023 01:08:53 +0200
Subject: [PATCH 034/153] python3-bitstring: update to 4.0.2.

---
 srcpkgs/python3-bitstring/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-bitstring/template b/srcpkgs/python3-bitstring/template
index f81c9a46f55c..4b89a4282d9b 100644
--- a/srcpkgs/python3-bitstring/template
+++ b/srcpkgs/python3-bitstring/template
@@ -1,16 +1,20 @@
 # Template file for 'python3-bitstring'
 pkgname=python3-bitstring
-version=3.1.7
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=4.0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3"
 short_desc="Python module for creation and analysis of binary data"
 maintainer="Arjan Mossel <arjanmossel@gmail.com>"
 license="MIT"
-homepage="https://scott-griffiths.github.io/bitstring/"
+homepage="https://github.com/scott-griffiths/bitstring"
 distfiles="${PYPI_SITE}/b/bitstring/bitstring-${version}.tar.gz"
-checksum=fdf3eb72b229d2864fb507f8f42b1b2c57af7ce5fec035972f9566de440a864a
+checksum=a391db8828ac4485dd5ce72c80b27ebac3e7b989631359959e310cd9729723b2
+
+do_check() {
+	python -m unittest
+}
 
 post_install() {
 	vlicense LICENSE

From 9ff12d746e63871b568ec6340c9112a88c86a833 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 17 Apr 2023 01:12:32 +0200
Subject: [PATCH 035/153] python3-curio: update to 1.6.

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

diff --git a/srcpkgs/python3-curio/template b/srcpkgs/python3-curio/template
index 585a4fb1b1f2..a712cbd3ad2d 100644
--- a/srcpkgs/python3-curio/template
+++ b/srcpkgs/python3-curio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-curio'
 pkgname=python3-curio
-version=1.5
-revision=3
+version=1.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -10,8 +10,9 @@ short_desc="Coroutine-based library for concurrent programming using async/await
 maintainer="Arjan Mossel <arjanmossel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/dabeaz/curio"
-distfiles="${PYPI_SITE}/c/curio/curio-${version}.tar.gz"
-checksum=af08212e590bb7da8e4cc39c42012711494dc20d622f162155ba296cc2e3bc10
+changelog="https://raw.githubusercontent.com/dabeaz/curio/master/CHANGES"
+distfiles="https://github.com/dabeaz/curio/archive/${version}.tar.gz"
+checksum=8bf9f1fa8b16f8f9f202c9c7d7189f3757ecc38e3823a0afa363b59acb087123
 
 do_check() {
 	# CI container has different privileges than expected in test_errors()

From ba977d228df78eba8f880ea790384dd5c0a6c5c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 30 Apr 2023 11:13:30 -0400
Subject: [PATCH 036/153] unison: update to 2.53.3.

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

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 32e036564671..2360574efa4f 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,6 +1,6 @@
 # Template file for 'unison'
 pkgname=unison
-version=2.53.2
+version=2.53.3
 revision=1
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
@@ -8,7 +8,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=fb337c221722e496916b385e50e99a49604b8aed3f5fafcc45029c1d2aa1232b
+checksum=aaea04fc5bc76dcfe8627683c9659ee4c194d4f992cc8aaa15bbb2820fc8de46
 nocross="OCaml does not cross compile"
 
 do_build() {

From c5b3bf0c7535f9a853eb2b78fd00be782937a7d9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 30 Apr 2023 10:14:58 -0500
Subject: [PATCH 037/153] libabigail: soname bump

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index e282bbd1f588..47aa54107d07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2683,7 +2683,7 @@ libdcadec.so.0 dcadec-0.2.0_1
 libcmark.so.0 cmark-0.24.1_1
 libvidstab.so.1.1 libvidstab-1.1.0_1
 libxdo.so.3 xdotool-3.20150503.1_1
-libabigail.so.1 libabigail-2.1_1
+libabigail.so.2 libabigail-2.3_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
 libKDevCMakeCommon.so.510 kdevelop-22.12.1_1
 libKDevClangPrivate.so.510 kdevelop-22.12.1_1

From ccfebe0600344d0952717705d97d30657551530c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 27 Mar 2023 00:31:35 -0300
Subject: [PATCH 038/153] singular: update to 4.3.2.

---
 common/shlibs             | 10 +++++-----
 srcpkgs/singular/template |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 47aa54107d07..a64330bd7cb9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4099,11 +4099,11 @@ libumfpack.so.6 SuiteSparse-6.0.1_1
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
-libSingular-4.3.1.so singular-4.3.1p2_1
-libfactory-4.3.1.so singular-4.3.1p2_1
-libpolys-4.3.1.so singular-4.3.1p2_1
-libomalloc-0.9.6.so singular-4.3.1p2_1
-libsingular_resources-4.3.1.so singular-4.3.1p2_1
+libomalloc-0.9.6.so singular-4.2.1_1
+libSingular-4.3.2.so singular-4.3.2_1
+libfactory-4.3.2.so singular-4.3.2_1
+libpolys-4.3.2.so singular-4.3.2_1
+libsingular_resources-4.3.2.so singular-4.3.2_1
 libbrial.so.3 brial-1.2.10_1
 libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index c73a020dcf15..0481f6cb1e11 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,6 +1,6 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.1p3
+version=4.3.2
 revision=1
 _majver=${version%p*}
 build_style=gnu-configure
@@ -20,7 +20,7 @@ maintainer="dkwo <npiazza@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.singular.uni-kl.de"
 distfiles="https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${_majver//./-}/singular-${version}.tar.gz"
-checksum=66cfaeee7ab909272fd81050a09cae3ec115652a01adde014a5128a54b97397a
+checksum=3fd565d1bd4265fa8ba7cc189137a36d9daf9939b5bb411466c2028d9191f6db
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"

From b34d0bbd284bb2d5c7d9801208cbae11a57a0421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 15 Mar 2023 09:27:58 -0300
Subject: [PATCH 039/153] sagemath: rebuild for singular update

Also fix doctests for pkg updates:
 - matplotlib 3.7
 - ipython 8.12
 - nauty 2.8.6
 - pythran 0.12.1

And add support for:
 - networkx 3.1

We use patches from upstream sagemath to fix all of these.

We also add pythran and sphinx to checkdepends to make sure doctests
pass when they are installed.
---
 ...support_singular_4.3.1.p3-5e5737a0c.patch} |  0
 .../34980-avoid_factoring_in_is_prime.patch   | 16 ++--
 .../patches/35177-matplotlib_3.7.patch        | 95 +++++++++++++++++++
 .../patches/35195-workaround_ecl_race.patch   | 56 +++++++++++
 .../patches/35204-fix_sage-cleaner.patch      | 28 ++++++
 .../sagemath/patches/35250-nauty_2.8.6.patch  | 35 +++++++
 .../sagemath/patches/35423-ipython_8.12.patch | 51 ++++++++++
 .../patches/35438-pythran_0.12.1.patch        | 41 ++++++++
 .../sagemath/patches/35584-networkx_3.1.patch | 81 ++++++++++++++++
 srcpkgs/sagemath/patches/get_patches          | 32 ++++++-
 srcpkgs/sagemath/template                     |  4 +-
 11 files changed, 425 insertions(+), 14 deletions(-)
 rename srcpkgs/sagemath/patches/{trac-34851-support_singular_4.3.1.p3-5e5737a0c.patch => 34851-support_singular_4.3.1.p3-5e5737a0c.patch} (100%)
 create mode 100644 srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
 create mode 100644 srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
 create mode 100644 srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
 create mode 100644 srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
 create mode 100644 srcpkgs/sagemath/patches/35423-ipython_8.12.patch
 create mode 100644 srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
 create mode 100644 srcpkgs/sagemath/patches/35584-networkx_3.1.patch

diff --git a/srcpkgs/sagemath/patches/trac-34851-support_singular_4.3.1.p3-5e5737a0c.patch b/srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
similarity index 100%
rename from srcpkgs/sagemath/patches/trac-34851-support_singular_4.3.1.p3-5e5737a0c.patch
rename to srcpkgs/sagemath/patches/34851-support_singular_4.3.1.p3-5e5737a0c.patch
diff --git a/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch b/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
index ca61a2ada4eb..ee0f0e656b28 100644
--- a/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
+++ b/srcpkgs/sagemath/patches/34980-avoid_factoring_in_is_prime.patch
@@ -1,8 +1,8 @@
 diff --git a/src/sage/rings/number_field/number_field_ideal.py b/src/sage/rings/number_field/number_field_ideal.py
-index d5f7157217f..1a9d11aec68 100644
+index d5f7157217f..8ca1f958039 100644
 --- a/src/sage/rings/number_field/number_field_ideal.py
 +++ b/src/sage/rings/number_field/number_field_ideal.py
-@@ -996,16 +996,36 @@ def is_prime(self):
+@@ -996,16 +996,38 @@ def is_prime(self):
              False
              sage: K.ideal(17).is_prime()  # ramified
              False
@@ -33,13 +33,15 @@ index d5f7157217f..1a9d11aec68 100644
 +        K = self.number_field().pari_nf()
 +        I = self.pari_hnf()
 +
-+        self._pari_prime = K.idealismaximal(I) or None
++        candidate = K.idealismaximal(I) or None
 +
 +        # PARI uses probabilistic primality testing inside idealismaximal().
-+        if self._pari_prime \
-+                and get_flag(None, 'arithmetic') \
-+                and not self._pari_prime[0].isprime():
-+            self._pari_prime = None
++        if get_flag(None, 'arithmetic'):
++            # proof required, check using isprime()
++            if candidate and not candidate[0].isprime():
++                candidate = None
++
++        self._pari_prime = candidate
 +
 +        return self._pari_prime is not None
  
diff --git a/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch b/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
new file mode 100644
index 000000000000..007f3324cfe4
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35177-matplotlib_3.7.patch
@@ -0,0 +1,95 @@
+diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
+index b77c69b2f77..0586a96ae55 100644
+--- a/src/sage/plot/complex_plot.pyx
++++ b/src/sage/plot/complex_plot.pyx
+@@ -563,7 +563,7 @@ def complex_to_cmap_rgb(z_values, cmap='turbo', contoured=False, tiled=False,
+     import matplotlib as mpl
+ 
+     if isinstance(cmap, str):
+-        cmap = mpl.cm.get_cmap(cmap)
++        cmap = mpl.colormaps[cmap]
+ 
+     if contour_base is None:
+         if contour_type == "linear":
+@@ -1206,11 +1206,11 @@ def complex_plot(f, x_range, y_range, contoured=False, tiled=False, cmap=None,
+                 domain = np.linspace(0, 1, 256)
+                 shifted_domain = np.roll(domain, 128)
+                 default_cmap = mpl.colors.LinearSegmentedColormap.from_list(
+-                    "sage_default", mpl.cm.get_cmap('hsv')(shifted_domain)
++                    "sage_default", mpl.colormaps['hsv'](shifted_domain)
+                 )
+                 cmap = default_cmap
+             else:
+-                cmap = mpl.cm.get_cmap(cmap)
++                cmap = mpl.colormaps[cmap]
+         rgbs = complex_to_cmap_rgb(
+             z_values, cmap=cmap, contoured=contoured, tiled=tiled,
+             contour_type=contour_type, contour_base=contour_base,
+diff --git a/src/sage/plot/contour_plot.py b/src/sage/plot/contour_plot.py
+index c0cab456686..4accb309580 100644
+--- a/src/sage/plot/contour_plot.py
++++ b/src/sage/plot/contour_plot.py
+@@ -848,9 +848,7 @@ def f(x,y): return cos(x) + sin(y)
+ 
+         sage: contour_plot(lambda x,y: 0, (-1,1), (-1,1),
+         ....:              contours=[0], fill=False, cmap=['blue'])
+-        ...
+-        UserWarning: No contour levels were found within the data range.
+-        Graphics object consisting of 1 graphics primitive
++        ...Graphics object consisting of 1 graphics primitive
+ 
+     .. PLOT::
+ 
+@@ -874,8 +872,7 @@ def f(x,y): return cos(x) + sin(y)
+     Check that :trac:`18074` is fixed::
+ 
+         sage: contour_plot(0, (0,1), (0,1))
+-        ... UserWarning: No contour levels were found within the data range.
+-        Graphics object consisting of 1 graphics primitive
++        ...Graphics object consisting of 1 graphics primitive
+ 
+     Domain points in :trac:`11648` with complex output are now skipped::
+ 
+diff --git a/src/sage/plot/graphics.py b/src/sage/plot/graphics.py
+index 64ea1a7e10f..cdc99ced263 100644
+--- a/src/sage/plot/graphics.py
++++ b/src/sage/plot/graphics.py
+@@ -2341,7 +2341,7 @@ def _matplotlib_tick_formatter(self, subplot, base=(10, 10),
+             sage: subplot = Figure().add_subplot(111)
+             sage: p._objects[0]._render_on_subplot(subplot)
+             sage: p._matplotlib_tick_formatter(subplot, **d)
+-            (<AxesSubplot:...>,
++            (<Axes...>,
+             <matplotlib.ticker.MaxNLocator object at ...>,
+             <matplotlib.ticker.MaxNLocator object at ...>,
+             <matplotlib.ticker.ScalarFormatter object at ...>,
+diff --git a/src/sage/plot/multigraphics.py b/src/sage/plot/multigraphics.py
+index 99c817f03a6..ae85183dc93 100644
+--- a/src/sage/plot/multigraphics.py
++++ b/src/sage/plot/multigraphics.py
+@@ -1207,7 +1207,7 @@ def _add_subplot(self, figure, index, **options):
+             sage: fig = Figure()
+             sage: ax1 = G._add_subplot(fig, 0)
+             sage: type(ax1)
+-            <class 'matplotlib.axes._subplots.AxesSubplot'>
++            <class 'matplotlib.axes...'>
+             sage: ax2 = G._add_subplot(fig, 1)
+             sage: fig.get_axes() == [ax1, ax2]
+             True
+diff --git a/src/sage/plot/plot3d/plot_field3d.py b/src/sage/plot/plot3d/plot_field3d.py
+index bdf39391d3e..fe10e27f58f 100644
+--- a/src/sage/plot/plot3d/plot_field3d.py
++++ b/src/sage/plot/plot3d/plot_field3d.py
+@@ -126,9 +126,9 @@ def plot_vector_field3d(functions, xrange, yrange, zrange,
+     vectors = [vector((ff(*point), gg(*point), hh(*point))) for point in points]
+ 
+     try:
+-        from matplotlib.cm import get_cmap
+-        cm = get_cmap(colors)
+-    except (TypeError, ValueError):
++        import matplotlib as mpl
++        cm = mpl.colormaps[colors]
++    except (TypeError, KeyError):
+         cm = None
+     if cm is None:
+         if isinstance(colors, (list, tuple)):
diff --git a/srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch b/srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
new file mode 100644
index 000000000000..1e0a708e8068
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35195-workaround_ecl_race.patch
@@ -0,0 +1,56 @@
+diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
+index c9ca5e30939..9459cb70334 100644
+--- a/src/sage/interfaces/maxima_lib.py
++++ b/src/sage/interfaces/maxima_lib.py
+@@ -77,6 +77,26 @@
+     sage: bar == foo
+     True
+ 
++TESTS:
++
++Check our workaround for a race in ecl works, see :trac:`26968`.
++We use a temporary `MAXIMA_USERDIR` so it's empty; we place it
++in `DOT_SAGE` since we expect it to have more latency than `/tmp`.
++
++    sage: import tempfile, subprocess
++    sage: tmpdir = tempfile.TemporaryDirectory(dir=DOT_SAGE)
++    sage: _ = subprocess.run(['sage', '-c',  # long time
++    ....: f'''
++    ....: import os
++    ....: os.environ["MAXIMA_USERDIR"] = "{tmpdir.name}"
++    ....: if not os.fork():
++    ....:     import sage.interfaces.maxima_lib
++    ....: else:
++    ....:     import sage.interfaces.maxima_lib
++    ....:     os.wait()
++    ....: '''])
++    sage: tmpdir.cleanup()
++
+ """
+ 
+ # ****************************************************************************
+@@ -116,7 +136,23 @@
+ ecl_eval("(setq $nolabels t))")
+ ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
+ ecl_eval("(set-locale-subdir)")
+-ecl_eval("(set-pathnames)")
++
++try:
++    ecl_eval("(set-pathnames)")
++except RuntimeError:
++    # Recover from :trac:`26968` by creating `*maxima-objdir*` here.
++    # This cannot be done before calling `(set-pathnames)` since
++    # `*maxima-objdir*` is computed there.
++    # We use python `os.makedirs()` which is immune to the race.
++    # Using `(ensure-directories-exist ...)` in lisp would be
++    # subject to the same race condition and since `*maxima-objdir*`
++    # has multiple components this is quite plausible to happen.
++    maxima_objdir = ecl_eval("*maxima-objdir*").python()[1:-1]
++    import os
++    os.makedirs(maxima_objdir, exist_ok=True)
++    # Call `(set-pathnames)` again to complete its job.
++    ecl_eval("(set-pathnames)")
++
+ ecl_eval("(defun add-lineinfo (x) x)")
+ ecl_eval('(defun principal nil (cond ($noprincipal (diverg)) ((not pcprntd) (merror "Divergent Integral"))))')
+ ecl_eval("(remprop 'mfactorial 'grind)")  # don't use ! for factorials (#11539)
diff --git a/srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch b/srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
new file mode 100644
index 000000000000..fc3e40da2a88
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35204-fix_sage-cleaner.patch
@@ -0,0 +1,28 @@
+diff --git a/src/bin/sage-cleaner b/src/bin/sage-cleaner
+index e2e578eec60..dc7d8f0482e 100755
+--- a/src/bin/sage-cleaner
++++ b/src/bin/sage-cleaner
+@@ -99,6 +99,15 @@ def cleanup():
+ 
+     return len(pid_list)
+ 
++def cleanup_cruft():
++    """ remove directories leftover from improper shutdown """
++    tmp_dirs = os.listdir(SAGE_TMP_ROOT)
++    for dir_entry in tmp_dirs:
++        baddir = os.path.join(SAGE_TMP_ROOT, dir_entry)
++        if os.path.isdir(baddir):
++            logger.warning('Removing old directory %s from SAGE_TMP_ROOT', baddir)
++            rm_rf(baddir)
++
+ def kill_spawned_jobs(jobfile, parent_pid):
+     logger.info("Killing %s's spawned jobs", parent_pid)
+     killed_them_all = True
+@@ -193,6 +202,7 @@ if __name__ == '__main__':
+     setup_daemon()
+     fix_old_mistakes()
+     logger.info("Starting sage-cleaner with PID %s", os.getpid())
++    cleanup_cruft()
+ 
+     if len(sys.argv) > 1:
+         wait = int(sys.argv[1])
diff --git a/srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch b/srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
new file mode 100644
index 000000000000..ea210e20ae52
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35250-nauty_2.8.6.patch
@@ -0,0 +1,35 @@
+diff --git a/src/sage/graphs/generators/families.py b/src/sage/graphs/generators/families.py
+index ec6a5c19e60..9dd7bc1cb1e 100644
+--- a/src/sage/graphs/generators/families.py
++++ b/src/sage/graphs/generators/families.py
+@@ -3660,7 +3660,7 @@ def nauty_gentreeg(options="", debug=False):
+ 
+         sage: gen = graphs.nauty_gentreeg("4", debug=True)
+         sage: print(next(gen))
+-        >A ...gentreeg Z=2:3 D=3 n=4
++        >A ...gentreeg ...
+         sage: gen = graphs.nauty_gentreeg("4 -q", debug=True)
+         sage: next(gen)
+         ''
+@@ -3687,7 +3687,7 @@ def nauty_gentreeg(options="", debug=False):
+         sage: list(graphs.nauty_gentreeg("3 -x", debug=True))
+         ['>E Usage: ...gentreeg [-D#] [-Z#:#] [-ulps] [-q] n [res/mod] ...
+         sage: list(graphs.nauty_gentreeg("3", debug=True))
+-        ['>A ...gentreeg Z=2:2 D=2 n=3\n', Graph on 3 vertices]
++        ['>A ...gentreeg ...\n', Graph on 3 vertices]
+     """
+     import shlex
+     from sage.features.nauty import NautyExecutable
+diff --git a/src/sage/graphs/graph_generators.py b/src/sage/graphs/graph_generators.py
+index df88bbe2713..1a8016976c2 100644
+--- a/src/sage/graphs/graph_generators.py
++++ b/src/sage/graphs/graph_generators.py
+@@ -966,7 +966,7 @@ def nauty_geng(self, options="", debug=False):
+             ...
+             ValueError: wrong format of parameter option
+             sage: list(graphs.nauty_geng("-c3", debug=True))
+-            ['>E Usage: ...geng [-cCmtfbd#D#] [-uygsnh] [-lvq] ...
++            ['>E Usage: ...geng ...\n']
+             sage: list(graphs.nauty_geng("-c 3", debug=True))
+             ['>A ...geng -cd1D2 n=3 e=2-3\n', Graph on 3 vertices, Graph on 3 vertices]
+         """
diff --git a/srcpkgs/sagemath/patches/35423-ipython_8.12.patch b/srcpkgs/sagemath/patches/35423-ipython_8.12.patch
new file mode 100644
index 000000000000..46bda084e48e
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35423-ipython_8.12.patch
@@ -0,0 +1,51 @@
+diff --git a/src/sage/repl/inputhook.py b/src/sage/repl/inputhook.py
+index da5df0268c0..7f7894f6dcf 100644
+--- a/src/sage/repl/inputhook.py
++++ b/src/sage/repl/inputhook.py
+@@ -17,6 +17,8 @@
+ 
+ import select
+ import errno
++import contextlib
++import io
+ 
+ from IPython import get_ipython
+ from IPython.terminal.pt_inputhooks import register
+@@ -47,15 +49,27 @@ def install():
+     """
+     Install the Sage input hook
+ 
+-    EXAMPLES::
++    EXAMPLES:
++
++    Make sure ipython is running so we really test this function::
++
++        sage: from sage.repl.interpreter import get_test_shell
++        sage: get_test_shell()
++        <sage.repl.interpreter.SageTestShell object at ...>
++
++    Run the function twice, to check it is idempotent (see :trac:`35235`)::
+ 
+         sage: from sage.repl.inputhook import install
+         sage: install()
++        sage: install()
+     """
+     ip = get_ipython()
+     if not ip:
+         return   # Not running in ipython, e.g. doctests
+-    ip.enable_gui('sage')
++    if ip._inputhook != sage_inputhook:
++        # silence `ip.enable_gui()` useless output
++        with contextlib.redirect_stdout(io.StringIO()):
++            ip.enable_gui('sage')
+ 
+ 
+ def uninstall():
+@@ -71,4 +85,6 @@ def uninstall():
+     if not ip:
+         return
+     if ip._inputhook == sage_inputhook:
+-        ip.enable_gui(None)
++        # silence `ip.enable_gui()` useless output
++        with contextlib.redirect_stdout(io.StringIO()):
++            ip.enable_gui(None)
diff --git a/srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch b/srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
new file mode 100644
index 000000000000..2cdc674d4f9e
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35438-pythran_0.12.1.patch
@@ -0,0 +1,41 @@
+From 532fbbaf71bb41c73920b584108eb2a09d6deeb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
+Date: Tue, 4 Apr 2023 12:56:57 -0300
+Subject: [PATCH] Ignore deprecation warnings triggered by pythran 0.12.1
+
+These happen with python 3.11, setuptools 67.6.1, numpy 1.24.2.
+When pythran 0.12.1 is installed, I get 24 doctest failures due to
+deprecation warnings; they are all gone with this commit.
+
+[backported from 839a6e928c264a9863bd42860c78ae95a6d9f3e0]
+---
+ src/sage/all.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/sage/all.py b/src/sage/all.py
+index 93588df1b93..ee775aad0e9 100644
+--- a/src/sage/all.py
++++ b/src/sage/all.py
+@@ -96,9 +96,17 @@ warnings.filterwarnings('ignore', category=DeprecationWarning,
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+     module='(.*[.]_vendor[.])?packaging')
+ 
+-# Ignore numpy warnings triggered by pythran
++# Ignore a few warnings triggered by pythran 0.12.1
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+-                        module='pythran')
++    message='\n\n  `numpy.distutils` is deprecated since NumPy 1.23.0',
++    module='pythran.dist')
++warnings.filterwarnings('ignore', category=DeprecationWarning,
++    message='pkg_resources is deprecated as an API|'
++            'Deprecated call to `pkg_resources.declare_namespace(.*)`',
++    module='pkg_resources')
++warnings.filterwarnings('ignore', category=DeprecationWarning,
++    message='msvccompiler is deprecated and slated to be removed',
++    module='distutils.msvccompiler')
+ 
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+                         message='The distutils(.sysconfig module| package) is deprecated',
+-- 
+2.40.0
+
diff --git a/srcpkgs/sagemath/patches/35584-networkx_3.1.patch b/srcpkgs/sagemath/patches/35584-networkx_3.1.patch
new file mode 100644
index 000000000000..66eedecff7c6
--- /dev/null
+++ b/srcpkgs/sagemath/patches/35584-networkx_3.1.patch
@@ -0,0 +1,81 @@
+diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py
+index c2e42bcbd3..b6a10efbf4 100644
+--- a/src/sage/graphs/graph.py
++++ b/src/sage/graphs/graph.py
+@@ -6786,13 +6786,21 @@ def cliques_number_of(self, vertices=None, cliques=None):
+             {(0, 0): 2, (0, 1): 3, (0, 2): 2, (1, 0): 2, (1, 1): 3, (1, 2): 2}
+             sage: F.cliques_number_of(vertices=[(0, 1), (1, 2)])
+             {(0, 1): 3, (1, 2): 2}
++            sage: F.cliques_number_of(vertices=(0, 1))
++            3
+             sage: G = Graph({0:[1,2,3], 1:[2], 3:[0,1]})
+             sage: G.show(figsize=[2,2])
+             sage: G.cliques_number_of()
+             {0: 2, 1: 2, 2: 1, 3: 1}
+         """
+-        import networkx
+-        return networkx.number_of_cliques(self.networkx_graph(), vertices, cliques)
++        if cliques is None:
++            cliques = self.cliques_maximal()
++
++        if vertices in self: # single vertex
++            return sum(1 for c in cliques if vertices in c)
++        else:
++            return { v : sum(1 for c in cliques if v in c)
++                     for v in vertices or self }
+ 
+     @doc_index("Clique-related methods")
+     def cliques_get_max_clique_graph(self):
+@@ -7493,17 +7501,32 @@ def cliques_containing_vertex(self, vertices=None, cliques=None):
+ 
+             sage: C = Graph('DJ{')
+             sage: C.cliques_containing_vertex()
+-            {0: [[4, 0]], 1: [[4, 1, 2, 3]], 2: [[4, 1, 2, 3]], 3: [[4, 1, 2, 3]], 4: [[4, 0], [4, 1, 2, 3]]}
++            {0: [[0, 4]],
++             1: [[1, 2, 3, 4]],
++             2: [[1, 2, 3, 4]],
++             3: [[1, 2, 3, 4]],
++             4: [[0, 4], [1, 2, 3, 4]]}
++            sage: C.cliques_containing_vertex(4)
++            [[0, 4], [1, 2, 3, 4]]
++            sage: C.cliques_containing_vertex([0, 1])
++            {0: [[0, 4]], 1: [[1, 2, 3, 4]]}
+             sage: E = C.cliques_maximal()
+             sage: E
+             [[0, 4], [1, 2, 3, 4]]
+             sage: C.cliques_containing_vertex(cliques=E)
+-            {0: [[0, 4]], 1: [[1, 2, 3, 4]], 2: [[1, 2, 3, 4]], 3: [[1, 2, 3, 4]], 4: [[0, 4], [1, 2, 3, 4]]}
++            {0: [[0, 4]],
++             1: [[1, 2, 3, 4]],
++             2: [[1, 2, 3, 4]],
++             3: [[1, 2, 3, 4]],
++             4: [[0, 4], [1, 2, 3, 4]]}
+ 
+             sage: G = Graph({0:[1,2,3], 1:[2], 3:[0,1]})
+             sage: G.show(figsize=[2,2])
+             sage: G.cliques_containing_vertex()
+-            {0: [[0, 1, 2], [0, 1, 3]], 1: [[0, 1, 2], [0, 1, 3]], 2: [[0, 1, 2]], 3: [[0, 1, 3]]}
++            {0: [[0, 1, 2], [0, 1, 3]],
++             1: [[0, 1, 2], [0, 1, 3]],
++             2: [[0, 1, 2]],
++             3: [[0, 1, 3]]}
+ 
+         Since each clique of a 2 dimensional grid corresponds to an edge, the
+         number of cliques in which a vertex is involved equals its degree::
+@@ -7518,8 +7541,14 @@ def cliques_containing_vertex(self, vertices=None, cliques=None):
+             sage: sorted(sorted(x for x in L) for L in d[(0, 1)])
+             [[(0, 0), (0, 1)], [(0, 1), (0, 2)], [(0, 1), (1, 1)]]
+         """
+-        import networkx
+-        return networkx.cliques_containing_node(self.networkx_graph(), vertices, cliques)
++        if cliques is None:
++            cliques = self.cliques_maximal()
++
++        if vertices in self: # single vertex
++            return [c for c in cliques if vertices in c]
++        else:
++            return { v : [c for c in cliques if v in c]
++                     for v in vertices or self }
+ 
+     @doc_index("Clique-related methods")
+     def clique_complex(self):
diff --git a/srcpkgs/sagemath/patches/get_patches b/srcpkgs/sagemath/patches/get_patches
index c98da68683cc..871ae38577fd 100755
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@@ -19,7 +19,7 @@ get_trac() {
 	ticket=$1
 	desc=$(echo "$2" | sed -e 's/ /_/g')
 	commit=$3
-	$DO wget "$URL_BASE_COMPARE$commit.diff" -O "trac-$ticket-$desc-$commit.patch"
+	$DO wget "$URL_BASE_COMPARE$commit.diff" -O "$ticket-$desc-$commit.patch"
 }
 
 # run from patches dir
@@ -29,13 +29,35 @@ cd $(dirname "$0")
 get_trac 34851 "support singular 4.3.1.p3" 5e5737a0c
 get_pr 35068 "fix tests giac 1.9.0.35" patch
 
-# positive review
+# merged in 10.0.beta1
+get_pr 35058 "skip unstable tests klyachko"
+
+# merged in 10.0.beta2
 get_pr 34994 "fix tests numpy 1.24"
 get_pr 34997 "fix edge case of integer_check"
-get_pr 35058 "skip unstable tests klyachko"
-get_pr 35094 "support gap 4.12"					# includes PR 35093
 
-# needs review 
+# merged in 10.0.beta3
 get_pr 34995 "support tachyon 0.99.2"
+
+# merged in 10.0.beta4
 get_pr 34980 "avoid factoring in is_prime"
+
+# merged in 10.0.beta5
+get_pr 35094 "support gap 4.12"					# includes PR 35093
+
+# merged in 10.0.beta6
 get_pr 35127 "fix very slow test stream.py"
+get_pr 35177 "matplotlib 3.7"
+get_pr 35195 "workaround ecl race"
+get_pr 35204 "fix sage-cleaner"
+
+# merged in 10.0.beta7
+get_pr 35250 "nauty 2.8.6"
+
+# merged in 10.0.beta8
+#get_pr 35337 "ipython 8.11"
+get_pr 35423 "ipython 8.12"						# includes PR 35337
+get_pr 35438 "pythran 0.12.1"
+
+# needs review
+get_pr 35584 "networkx 3.1"
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 75695f0e5f87..66a543efd21d 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=9.8
-revision=1
+revision=2
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
 _bindir=/usr/lib/sagemath/$version/bin
@@ -26,7 +26,7 @@ depends="FlintQS eclib-devel fflas-ffpack flintlib-devel gcc-fortran gd-devel
  python3-sympy python3-traitlets sage-data-combinatorial_designs
  sage-data-conway_polynomials sage-data-elliptic_curves sage-data-graphs
  sage-data-polytopes_db sympow tachyon threejs-sage"
-checkdepends="$depends"
+checkdepends="$depends pythran python3-Sphinx"
 short_desc="Open source mathematics software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"

From 26d9c19cf0e4e354b5b9549fbe143e0d79267a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 28 Apr 2023 19:38:50 -0300
Subject: [PATCH 040/153] python3-networkx: update to 3.1.

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

diff --git a/srcpkgs/python3-networkx/template b/srcpkgs/python3-networkx/template
index 83e21291feb8..526f4c5e259a 100644
--- a/srcpkgs/python3-networkx/template
+++ b/srcpkgs/python3-networkx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-networkx'
 pkgname=python3-networkx
-version=2.8.8
+version=3.1
 revision=1
 build_style=python3-module
 # failing in i686
@@ -10,12 +10,12 @@ depends="python3"
 checkdepends="python3-numpy python3-scipy python3-matplotlib python3-pandas
  python3-lxml python3-sympy python3-pytest-xdist"
 short_desc="Python3 package for creating and manipulating graphs and networks"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://networkx.org"
-changelog="https://networkx.org/documentation/stable/release/"
+changelog="https://github.com/networkx/networkx/raw/main/doc/release/release_${version}.rst"
 distfiles="${PYPI_SITE}/n/networkx/networkx-${version}.tar.gz"
-checksum=230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e
+checksum=de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61
 
 post_install() {
 	vlicense LICENSE.txt

From 14801db9c07b96927c819b0c83ce1016b002760b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 30 Apr 2023 17:38:13 -0300
Subject: [PATCH 041/153] python3-ipython: update to 8.13.1.

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

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 11724c9acdbe..a09b9559fba1 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.12.0
+version=8.13.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,20 +16,9 @@ license="BSD-3-Clause"
 homepage="https://ipython.org/"
 changelog="https://github.com/ipython/ipython/raw/main/docs/source/whatsnew/version8.rst"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=a950236df04ad75b5bc7f816f9af3d74dc118fd42f2ff7e80e8e60ca1f182e2d
+checksum=9c8487ac18f330c8a683fc50ab6d7bc0fcf9ef1d7a9f6ce7926938261067b81f
 conflicts="python-ipython<=5.8.0_2"
 
-do_check() {
-	# Tests fail when building (and have for awhile) but don't hinder use
-	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest \
-		-k "not test_all_completions_dups and \
-			not test_deduplicate_completions and \
-			not test_magic_arguments and \
-			not test_pinfo_docstring_if_detail_and_no_source and \
-			not test_pprint_heap_allocated_type and \
-			not test_system_interrupt and not test_code_from_file"
-}
-
 post_install() {
 	# remove iptest
 	rm -f ${DESTDIR}/usr/bin/iptest*

From 6e74c19d9e3f3d32f8d546a724554c1118c2a67f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:24:41 -0400
Subject: [PATCH 042/153] audacious: update to 4.3.1.

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

diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index 1b4a0487f163..ddd89b22eaf5 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,25 +1,25 @@
 # Template file for 'audacious'
 #Keep in sync with audacious-plugins!
 pkgname=audacious
-version=4.3
+version=4.3.1
 revision=1
 build_style=meson
-configure_args="-Dlibarchive=true $(vopt_bool gtk) $(vopt_bool gtk gtk3)
+configure_args="-Dlibarchive=true $(vopt_bool gtk3 gtk) $(vopt_bool gtk3)
  $(vopt_bool qt) $(vopt_bool qt qt6) -Dbuildstamp=xbps"
 hostmakedepends="pkg-config gettext glib-devel $(vopt_if qt 'qt6-base qt6-tools')"
 makedepends="libSM-devel dbus-glib-devel libguess-devel libarchive-devel
- $(vopt_if gtk gtk+3-devel) $(vopt_if qt qt6-base-devel)"
+ $(vopt_if gtk3 gtk+3-devel) $(vopt_if qt qt6-base-devel)"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Lightweight, advanced audio player focused on audio quality"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="BSD-2-Clause"
 homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"
-checksum=27584dc845c7e70db8c9267990945f17322a1ecc80ff8b452e9ca916a0ce9091
+checksum=85e9e26841505b51e342ee72a2d05f19bef894f567a029ebb3f3e0c1adb42042
 
-build_options="gtk qt"
+build_options="gtk3 qt"
 build_options_default="qt"
-vopt_conflict gtk qt
+vopt_conflict gtk3 qt
 
 post_install() {
 	vlicense COPYING

From 325d1c7d5b8f83b2a293a3f24f741b4a3ca83219 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:25:07 -0400
Subject: [PATCH 043/153] audacious-plugins: update to 4.3.1.

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

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 9d410c299622..64b0bff6ae6f 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,10 +1,10 @@
 # Template file for 'audacious-plugins'
 #Keep in sync with audacious!
 pkgname=audacious-plugins
-version=4.3
+version=4.3.1
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk) $(vopt_bool gtk gtk3)
+configure_args="$(vopt_bool gtk3 gtk) $(vopt_bool gtk3)
  $(vopt_bool qt) $(vopt_bool qt qt6)"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if qt qt6-tools)"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
@@ -12,17 +12,17 @@ makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
  libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel
  libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel opus-devel opusfile-devel
  libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel libopenmpt-devel pipewire-devel
- $(vopt_if gtk gtk+3-devel) $(vopt_if qt 'qt6-base-devel qt6-multimedia-devel')"
+ $(vopt_if gtk3 gtk+3-devel) $(vopt_if qt 'qt6-base-devel qt6-multimedia-devel')"
 short_desc="Plugins for the Audacious media player"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="BSD-2-Clause"
 homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"
-checksum=662ef6c8c4bd70d0f35fd1c5f08b91549b9436638b65f8a1a33956b09df89fc6
+checksum=2dea26e3af583a2d684df240b27b2b2932bcd653df4db500a85f4fe5d5fdc8a6
 
-build_options="gtk qt"
+build_options="gtk3 qt"
 build_options_default="qt"
-vopt_conflict gtk qt
+vopt_conflict gtk3 qt
 
 post_install() {
 	vlicense COPYING

From 824aa993d56b4cfa9fb3b4db6ff28352fa9a455b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:25:17 -0400
Subject: [PATCH 044/153] gqrx: update to 2.16.

qt5 -> qt6
---
 srcpkgs/gqrx/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 1966c2a8f09b..ce91b41a21e1 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,13 +1,13 @@
 # Template file for 'gqrx'
 pkgname=gqrx
-version=2.15.9
-revision=3
+version=2.16
+revision=1
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
  $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3 gnuradio"
-makedepends="gnuradio-devel gnuradio-osmosdr-devel pulseaudio-devel qt5-svg-devel
- alsa-lib-devel jack-devel qt5-tools $(vopt_if portaudio portaudio-devel)"
+hostmakedepends="pkg-config qt6-base qt6-tools python3 gnuradio"
+makedepends="gnuradio-devel gnuradio-osmosdr-devel pulseaudio-devel qt6-svg-devel
+ alsa-lib-devel jack-devel qt6-tools $(vopt_if portaudio portaudio-devel)"
 depends="desktop-file-utils"
 short_desc="Software defined radio receiver powered by GNU Radio and Qt"
 maintainer="classabbyamp <void@placeviolette.net>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gqrx.dk"
 changelog="https://raw.githubusercontent.com/gqrx-sdr/gqrx/master/resources/news.txt"
 distfiles="https://github.com/gqrx-sdr/gqrx/archive/v${version}.tar.gz"
-checksum=4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44
+checksum=eab65f490da22c3f276366f418af37803bd0d51d8d31b1ce7fdd4cac47932456
 
 build_options="gr_audio portaudio"
 vopt_conflict gr_audio portaudio

From bb8988a41331b7dce9a4a2e79cb811747c9bce01 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:25:37 -0400
Subject: [PATCH 045/153] hamlib: update to 4.5.5.

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

diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 6e74d94ffa17..18b440781e27 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,6 +1,6 @@
 # Template file for 'hamlib'
 pkgname=hamlib
-version=4.5.4
+version=4.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-perl-binding --with-python-binding
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://hamlib.github.io"
 changelog="https://raw.githubusercontent.com/Hamlib/Hamlib/master/NEWS"
 distfiles="https://github.com/Hamlib/Hamlib/releases/download/${version}/hamlib-${version}.tar.gz"
-checksum=b1aea97d6093990b77d5dc4bde6b9ca06183ddb7e24da7e2367a2acc957b7ac2
+checksum=601c89f32ed225e9527ade3d64d0d05d23202c05ae21ffa77e59d70ee4597fcd
 
 CFLAGS="-DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
 

From 21250def76df8ade670d31f1c5756f45d1b12490 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:25:43 -0400
Subject: [PATCH 046/153] noto-fonts-ttf: update to 23.5.1.

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

diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template
index f6160b5030ea..8763c4cc9440 100644
--- a/srcpkgs/noto-fonts-ttf/template
+++ b/srcpkgs/noto-fonts-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'noto-fonts-ttf'
 pkgname=noto-fonts-ttf
 reverts="20220810_1 20190926_2 20190926_1 20181202_1 20181106_1"
-version=23.4.1
+version=23.5.1
 revision=1
 depends="font-util"
 short_desc="Google Noto TTF Fonts"
@@ -9,7 +9,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="OFL-1.1"
 homepage="https://notofonts.github.io/"
 distfiles="https://github.com/notofonts/notofonts.github.io/archive/refs/tags/noto-monthly-release-${version}.tar.gz"
-checksum=e80c936d78caf063db5cbb1c1625ffbd43a94de2491a0f02eaa18c116fca133b
+checksum=393e20547ea09d7c47053e86bcd4c16d753283244a96c09a7dcd79eea27aa3fa
 font_dirs="/usr/share/fonts/noto"
 
 do_install() {

From 4d3a4aeb6d73561b55cfbd71c4fabfef3ac00a6c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:25:47 -0400
Subject: [PATCH 047/153] python3-pytest-xdist: update to 3.2.1.

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

diff --git a/srcpkgs/python3-pytest-xdist/template b/srcpkgs/python3-pytest-xdist/template
index f8881eb4ad34..3128717d293a 100644
--- a/srcpkgs/python3-pytest-xdist/template
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytest-xdist'
 pkgname=python3-pytest-xdist
-version=3.2.0
+version=3.2.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/pytest-dev/pytest-xdist"
 changelog="https://raw.githubusercontent.com/pytest-dev/pytest-xdist/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pytest-xdist/pytest-xdist-${version}.tar.gz"
-checksum=fa10f95a2564cd91652f2d132725183c3b590d9fdcdec09d3677386ecf4c1ce9
+checksum=1849bd98d8b242b948e472db7478e090bf3361912a8fed87992ed94085f54727
 # tests only work in tox
 make_check=no
 

From a05f1ded593145782a05365b3025bef8638b1f9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 03:25:51 -0400
Subject: [PATCH 048/153] xf86-input-wacom: update to 1.2.0.

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

diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template
index 51b964682914..19eff18d6054 100644
--- a/srcpkgs/xf86-input-wacom/template
+++ b/srcpkgs/xf86-input-wacom/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-input-wacom'
 pkgname=xf86-input-wacom
-version=1.1.0
+version=1.2.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only"
 homepage="https://github.com/linuxwacom/xf86-input-wacom"
 distfiles="https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-${version}/xf86-input-wacom-${version}.tar.bz2"
-checksum=23b674067f344de22bcbb4bac885c43df54c5e841f6dade7c9d18ba7ce297a12
+checksum=13c23208b2bc2bfd7b3a127ca667bb1399e54e3fcc22386ef1fb54be1d72685d
 lib32disabled=yes
 
 xf86-input-wacom-devel_package() {

From 337c99434b2ee2d0437e6da11d0f60dada97a771 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 04:17:19 -0400
Subject: [PATCH 049/153] audacious-plugins: fix cross

for some reason, this fails to configure on cross with this option enabled

probably caused by:
https://github.com/audacious-media-player/audacious-plugins/commit/cbbd7743f7137f6a7434e93ef46151af0228a041
---
 srcpkgs/audacious-plugins/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 64b0bff6ae6f..88cbc1671fc6 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -24,6 +24,11 @@ build_options="gtk3 qt"
 build_options_default="qt"
 vopt_conflict gtk3 qt
 
+if [ -n "$CROSS_BUILD" ]; then
+	# fails to configure: FileNotFoundError: [Errno 2] No such file or directory: '/usr/include/qt6'
+	configure_args+=" -Dhotkey=false"
+fi
+
 post_install() {
 	vlicense COPYING
 }

From 3cf863f894b67b3c93e23ac7830ca46b697d308a Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 1 May 2023 11:11:00 +0200
Subject: [PATCH 050/153] todoist: update to 0.20.0.

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

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 51f8a3beab72..72c1e50ed1c5 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
-version=0.18.0
-revision=2
+version=0.20.0
+revision=1
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/sachaos/todoist"
 distfiles="https://github.com/sachaos/todoist/archive/refs/tags/v${version}.tar.gz"
-checksum=2cc89bdf44d5a9bda6f748069cf8841e10e3b0c14dd4ddb17d5b1f7a7bc7d759
+checksum=cd496259a37f1b9868eddcc3d3f83b63b82eb94b7ab4830ad3f490fed51a5918
 
 post_install() {
 	vdoc README.md

From 553a9059278dde8dc65e09ef1e6109ddab66eb58 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 1 May 2023 09:55:01 -0400
Subject: [PATCH 051/153] openjdk17: update to 17.0.7+7.

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

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 40e1e42d72fe..7aff34f6e911 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.5+7
-revision=2
+version=17.0.7+7
+revision=1
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
@@ -45,7 +45,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="f268e91052adb773ed5ecac70b232e70e830c89dd2d570c8c872bfaf2772867e
+checksum="43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"

From 98bce17f6148ddecbdba2f9de9113bca9a238c4f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 May 2023 11:49:29 -0500
Subject: [PATCH 052/153] jc: update to 1.23.2.

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

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 026d105d65af..b5b6f1e819f5 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.23.1
+version=1.23.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/kellyjonbrazil/jc"
 changelog="https://raw.githubusercontent.com/kellyjonbrazil/jc/master/CHANGELOG"
 distfiles="https://github.com/kellyjonbrazil/jc/archive/refs/tags/v${version}.tar.gz"
-checksum=c2f916f2aed4ca4eaefc1fbdfcf68f37f384b2499a8f9a522bbaceb5f5d36e89
+checksum=d3df831ccaebb17800a7f1feb918daf5e9cf7fd81a12cced1670305aafe8a55e
 
 post_install() {
 	vman man/jc.1

From 09ec55c0f5d684336a703fc9d58149024feff53a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 May 2023 11:50:31 -0500
Subject: [PATCH 053/153] ssh-audit: update to 2.9.0.

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

diff --git a/srcpkgs/ssh-audit/template b/srcpkgs/ssh-audit/template
index 0e09ddc1b2f2..0a151db3082c 100644
--- a/srcpkgs/ssh-audit/template
+++ b/srcpkgs/ssh-audit/template
@@ -1,7 +1,7 @@
 # Template file for 'ssh-audit'
 pkgname=ssh-audit
-version=2.5.0
-revision=3
+version=2.9.0
+revision=1
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jtesta/ssh-audit"
 distfiles="https://github.com/jtesta/ssh-audit/archive/v${version}.tar.gz"
-checksum=43a1679ba1bd829b0f871bb9ab0e5d861c3e074b73f1e9cb66d687adce94a462
+checksum=29473d4daa370bc1334c092db5324d9cd61f486daa19236f9ec0d13674b38e9b
 python_version=3
 
 post_install() {

From 12633955f3b752d29172fa1927ff5c6091e34c9f Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 23:53:36 +0530
Subject: [PATCH 054/153] libcpuid: update to 0.6.2, orphan.

Maintainer hasn't touched the package since creating it.
---
 common/shlibs             | 2 +-
 srcpkgs/libcpuid/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a64330bd7cb9..ba0744dac158 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -672,7 +672,7 @@ libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
 liblvm2app.so.2.2 liblvm2app-2.02.54_1
 libcpufreq.so.0 libcpufreq-007_1
-libcpuid.so.15 libcpuid-0.5.0_1
+libcpuid.so.16 libcpuid-0.6.2_1
 libgucharmap_2_90.so.7 gucharmap-3.0.0_1
 libgphoto2.so.6 libgphoto2-2.5.7_1
 libgphoto2_port.so.12 libgphoto2-2.5.7_1
diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
index 3cfeb869ba2a..6257293e664e 100644
--- a/srcpkgs/libcpuid/template
+++ b/srcpkgs/libcpuid/template
@@ -1,18 +1,18 @@
 # Template file for 'libcpuid'
 pkgname=libcpuid
-version=0.5.1
+version=0.6.2
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
 hostmakedepends="doxygen"
 checkdepends="python3"
 short_desc="Small C library for x86 CPU detection and feature extraction"
-maintainer="cr6git <quark6@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/anrieff/libcpuid"
 changelog="https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"
 distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz"
-checksum=36d62842ef43c749c0ba82237b10ede05b298d79a0e39ef5fd1115ba1ff8e126
+checksum=3e7f2fc243a6a68d6c909b701cfa0db6422ec33fccf91ea5ab7beda3eb798672
 
 post_install() {
 	vlicense COPYING

From 31f54b135ce4fc784f9c31755d757095027a4d6f Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 23:54:06 +0530
Subject: [PATCH 055/153] nix: revbump for libcpuid-0.6.2

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

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 1c9bd931df65..6c842fa336c3 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.11.0
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=qemu
 # Use /nix/var as suggested by the official Manual.

From 7e00b892e6921b6d3c71bcbbeb6501ddb2719c9e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 22 Feb 2023 18:29:49 +0000
Subject: [PATCH 056/153] procps-ng: update to 4.0.3.

---
 common/shlibs              |  2 +-
 srcpkgs/procps-ng/template | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ba0744dac158..8c47e79b8c43 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2330,7 +2330,7 @@ libgedacairo.so.1 geda-1.10.2_1
 libxornstorage.so.0 geda-1.10.2_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
-libprocps.so.8 procps-ng-3.3.16_1
+libproc2.so.0 procps-ng-4.0.3_1
 libgegl-0.4.so.0 gegl-0.4.16_1
 libgegl-npd-0.4.so gegl-0.4.16_1
 libgegl-sc-0.4.so gegl-0.4.16_1
diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index 54239e6550f6..00fa9817f531 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -1,12 +1,12 @@
 # Template file for 'procps-ng'
 pkgname=procps-ng
-version=3.3.17
-revision=2
+version=4.0.3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/bin
  --libdir=/usr/lib --disable-kill --enable-watch8bit
  --disable-modern-top --without-systemd"
-hostmakedepends="automake gettext-devel libtool pkg-config"
+hostmakedepends="gettext-devel pkg-config"
 makedepends="ncurses-devel"
 checkdepends="dejagnu"
 short_desc="Utilities for monitoring your system and its processes"
@@ -14,27 +14,26 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.com/procps-ng/procps"
 changelog="https://gitlab.com/procps-ng/procps/raw/master/NEWS"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/Production/${pkgname}-${version}.tar.xz"
-checksum=4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4
+distfiles="${SOURCEFORGE_SITE}/procps-ng/Production/procps-ng-${version}.tar.xz"
+checksum=303c8ec4f96ae18d8eaef86c2bd0986938764a45dc505fe0a0af868c674dba92
+# "pmap X with unreachable process" and "pmap XX with unreachable process" fail
+# in the CI.
+make_check=ci-skip
 
 conf_files="/etc/sysctl.conf"
 
-post_extract() {
-	sed -i 's,ncursesw/ncurses.h,ncurses.h,g' watch.c
-	sed -i '1i#include <utmp.h>' w.c
-	sed -i '1i#include <langinfo.h>' proc/escape.c
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# See https://gitlab.com/procps-ng/procps/-/issues/193 and
+	# https://gitlab.com/procps-ng/procps/-/merge_requests/129.
+	configure_args+=" --disable-w"
+fi
 
-pre_configure() {
-	autoreconf -fi
+post_extract() {
+	vsed -i 's,ncursesw/ncurses.h,ncurses.h,g' src/watch.c
 }
 
 post_install() {
 	vconf ${FILESDIR}/sysctl.conf
-
-	# clashes with extrace, will be renamed in procps-ng 3.3.18.
-	rm -f ${DESTDIR}/usr/bin/pwait
-	rm -f ${DESTDIR}/usr/share/man/man1/pwait.1
 }
 
 procps-ng-devel_package() {

From 647bddcbb14bd4dc8536353abb9ee8766c3fe640 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 23:54:38 +0530
Subject: [PATCH 057/153] CPU-X: update to 4.5.2, orphan

---
 srcpkgs/CPU-X/template | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index e132a629bbfb..bde8e7071d9e 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,25 +1,27 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.3.0
-revision=2
+version=4.5.2
+revision=1
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="pkg-config nasm"
 makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
- $(vopt_if gtk3 gtk+3-devel)"
+ glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
+ vulkan-loader Vulkan-Headers"
+checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
-maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://x0rg.github.io/CPU-X/"
-changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
-distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
-build_options="gtk3"
-build_options_default="gtk3"
-# needs grep -P which is not available in chroot-grep and replacing it with
-# grep breaks base-chroot
-make_check=no
+homepage="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/ChangeLog.md"
+distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
+checksum=6cdab38928ca5684b22f7b8d868d42a25a48be6da813743b6b59a88d6e9f25d1
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ]; then
+	# Installing the packages in checkdepends causes base-chroot to break.
+	# So, only run the checks in CI, where the chroot is ethereal anyway.
+	make_check=no
+fi
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"

From ff4ead96d9afdf81317ccff836d6b1a25d3f6f2a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 23 Feb 2023 17:26:37 +0000
Subject: [PATCH 058/153] lxqt-session: fix build/run with libproc2.

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

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 979c6097840e..3b677d93e1c6 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,7 +1,7 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
 version=1.3.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
  perl"

From 111918317d06598fe1459dbe139923404f3f4b9d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 23 Feb 2023 17:59:06 +0000
Subject: [PATCH 059/153] igt-gpu-tools: update to 1.27.1.

---
 .../patches/fix-build-with-libproc2.diff      | 491 ++++++++++++++++++
 ...t_edid-Allocate-raw-8-bytes-for-VSDB.patch |  42 --
 .../patches/meson-fix-underscorify-call.patch |  36 --
 srcpkgs/igt-gpu-tools/patches/musl.patch      | 342 ++++++++----
 srcpkgs/igt-gpu-tools/template                |  18 +-
 5 files changed, 725 insertions(+), 204 deletions(-)
 create mode 100644 srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff
 delete mode 100644 srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch
 delete mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch

diff --git a/srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff b/srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff
new file mode 100644
index 000000000000..21b1866c9cd9
--- /dev/null
+++ b/srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff
@@ -0,0 +1,491 @@
+Description: Link to libproc2
+ libproc2 is the new library for libprocps
+Author: Craig Small <csmall@debian.org>
+Bug-Debian: https://bugs.debian.org/1024221
+Reviewed-by: Craig Small <csmall@debian.org>
+Last-Update: 2022-12-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/igt_aux.c
++++ b/lib/igt_aux.c
+@@ -52,8 +52,16 @@
+ #include <assert.h>
+ #include <grp.h>
+ 
++#ifdef HAVE_LIBPROCPS
+ #include <proc/readproc.h>
++#endif
++#ifdef HAVE_LIBPROC2
++#include <libproc2/pids.h>
++#endif
++
+ #include <libudev.h>
++#include <linux/limits.h>
++#include <dirent.h>
+ 
+ #include "drmtest.h"
+ #include "i915_drm.h"
+@@ -1217,6 +1225,7 @@ void igt_unlock_mem(void)
+  */
+ int igt_is_process_running(const char *comm)
+ {
++#if HAVE_LIBPROCPS
+ 	PROCTAB *proc;
+ 	proc_t *proc_info;
+ 	bool found = false;
+@@ -1235,6 +1244,26 @@ int igt_is_process_running(const char *c
+ 
+ 	closeproc(proc);
+ 	return found;
++#endif
++#ifdef HAVE_LIBPROC2
++	enum pids_item Item[] = { PIDS_CMD };
++	struct pids_info *info = NULL;
++	struct pids_stack *stack;
++	char *pid_comm;
++	bool found = false;
++
++	if (procps_pids_new(&info, Item, 1) < 0)
++	    return false;
++	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
++	    pid_comm = PIDS_VAL(0, str, stack, info);
++	    if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) {
++		found = true;
++		break;
++	    }
++	}
++	procps_pids_unref(&info);
++	return found;
++#endif
+ }
+ 
+ /**
+@@ -1251,6 +1280,7 @@ int igt_is_process_running(const char *c
+  */
+ int igt_terminate_process(int sig, const char *comm)
+ {
++#ifdef HAVE_LIBPROCPS
+ 	PROCTAB *proc;
+ 	proc_t *proc_info;
+ 	int err = 0;
+@@ -1272,6 +1302,29 @@ int igt_terminate_process(int sig, const
+ 
+ 	closeproc(proc);
+ 	return err;
++#endif
++#ifdef HAVE_LIBPROC2
++	enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD };
++	struct pids_info *info = NULL;
++	struct pids_stack *stack;
++	char *pid_comm;
++	int pid;
++	int err = 0;
++
++	if (procps_pids_new(&info, Items, 2) < 0)
++		return -errno;
++	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
++		pid = PIDS_VAL(0, s_int, stack, info);
++		pid_comm = PIDS_VAL(1, str, stack, info);
++		if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) {
++			if (kill(pid, sig) < 0)
++				err = -errno;
++			break;
++		}
++	}
++	procps_pids_unref(&info);
++	return err;
++#endif
+ }
+ 
+ struct pinfo {
+@@ -1341,9 +1394,9 @@ igt_show_stat_header(void)
+ }
+ 
+ static void
+-igt_show_stat(proc_t *info, int *state, const char *fn)
++igt_show_stat(const pid_t tid, const char *cmd, int *state, const char *fn)
+ {
+-	struct pinfo p = { .pid = info->tid, .comm = info->cmd, .fn = fn };
++	struct pinfo p = { .pid = tid, .comm = cmd, .fn = fn };
+ 
+ 	if (!*state)
+ 		igt_show_stat_header();
+@@ -1353,7 +1406,7 @@ igt_show_stat(proc_t *info, int *state,
+ }
+ 
+ static void
+-__igt_lsof_fds(proc_t *proc_info, int *state, char *proc_path, const char *dir)
++__igt_lsof_fds(const pid_t tid, const char *cmd, int *state, char *proc_path, const char *dir)
+ {
+ 	struct dirent *d;
+ 	struct stat st;
+@@ -1400,7 +1453,7 @@ again:
+ 		dirn = dirname(copy_fd_lnk);
+ 
+ 		if (!strncmp(dir, dirn, strlen(dir)))
+-			igt_show_stat(proc_info, state, fd_lnk);
++			igt_show_stat(tid, cmd, state, fd_lnk);
+ 
+ 		free(copy_fd_lnk);
+ 		free(fd_lnk);
+@@ -1416,13 +1469,14 @@ again:
+ static void
+ __igt_lsof(const char *dir)
+ {
+-	PROCTAB *proc;
+-	proc_t *proc_info;
+-
+ 	char path[30];
+ 	char *name_lnk;
+ 	struct stat st;
+ 	int state = 0;
++#ifdef HAVE_LIBPROCPS
++	PROCTAB *proc;
++	proc_t *proc_info;
++
+ 
+ 	proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
+ 	igt_assert(proc != NULL);
+@@ -1456,6 +1510,44 @@ __igt_lsof(const char *dir)
+ 	}
+ 
+ 	closeproc(proc);
++#endif
++#ifdef HAVE_LIBPROC2
++	enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD };
++	struct pids_info *info = NULL;
++	struct pids_stack *stack;
++
++	if (procps_pids_new(&info, Items, 2) < 0)
++		return;
++	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
++		ssize_t read;
++		int tid = PIDS_VAL(0, s_int, stack, info);
++		char *pid_comm = PIDS_VAL(1, str, stack, info);
++
++		/* check current working directory */
++		memset(path, 0, sizeof(path));
++		snprintf(path, sizeof(path), "/proc/%d/cwd", tid);
++
++		if (stat(path, &st) == -1)
++			continue;
++
++		name_lnk = malloc(st.st_size + 1);
++
++		igt_assert((read = readlink(path, name_lnk, st.st_size + 1)));
++		name_lnk[read] = '\0';
++
++		if (!strncmp(dir, name_lnk, strlen(dir)))
++			igt_show_stat(tid, pid_comm, &state, name_lnk);
++
++		/* check also fd, seems that lsof(8) doesn't look here */
++		memset(path, 0, sizeof(path));
++		snprintf(path, sizeof(path), "/proc/%d/fd", tid);
++
++		__igt_lsof_fds(tid, pid_comm, &state, path, dir);
++
++		free(name_lnk);
++	}
++	procps_pids_unref(&info);
++#endif
+ }
+ 
+ /**
+@@ -1490,7 +1582,7 @@ igt_lsof(const char *dpath)
+ 	free(sanitized);
+ }
+ 
+-static void pulseaudio_unload_module(proc_t *proc_info)
++static void pulseaudio_unload_module(const uid_t euid, const gid_t egid)
+ {
+ 	struct igt_helper_process pa_proc = {};
+ 	char xdg_dir[PATH_MAX];
+@@ -1498,14 +1590,14 @@ static void pulseaudio_unload_module(pro
+ 	struct passwd *pw;
+ 
+ 	igt_fork_helper(&pa_proc) {
+-		pw = getpwuid(proc_info->euid);
++		pw = getpwuid(euid);
+ 		homedir = pw->pw_dir;
+-		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid);
++		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid);
+ 
+ 		igt_info("Request pulseaudio to stop using audio device\n");
+ 
+-		setgid(proc_info->egid);
+-		setuid(proc_info->euid);
++		setgid(egid);
++		setuid(euid);
+ 		clearenv();
+ 		setenv("HOME", homedir, 1);
+ 		setenv("XDG_RUNTIME_DIR",xdg_dir, 1);
+@@ -1524,10 +1616,12 @@ static void pipewire_reserve_wait(void)
+ 	char xdg_dir[PATH_MAX];
+ 	const char *homedir;
+ 	struct passwd *pw;
+-	proc_t *proc_info;
+-	PROCTAB *proc;
++	int tid=0, euid, egid;
+ 
++#ifdef HAVE_LIBPROCPS
+ 	igt_fork_helper(&pw_reserve_proc) {
++		proc_t *proc_info;
++		PROCTAB *proc;
+ 		igt_info("Preventing pipewire-pulse to use the audio drivers\n");
+ 
+ 		proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
+@@ -1539,21 +1633,44 @@ static void pipewire_reserve_wait(void)
+ 			freeproc(proc_info);
+ 		}
+ 		closeproc(proc);
++		tid = proc_info->tid;
++		euid = proc_info->euid;
++		egid = proc_info->egid;
++		freeproc(proc_info);
++#endif
++#ifdef HAVE_LIBPROC2
++	igt_fork(child, 1) {
++		enum pids_item Items[] = { PIDS_ID_PID, PIDS_ID_EUID, PIDS_ID_EGID };
++		enum rel_items { EU_PID, EU_EUID, EU_EGID };
++		struct pids_info *info = NULL;
++		struct pids_stack *stack;
++
++		igt_info("Preventing pipewire-pulse to use the audio drivers\n");
++
++		if (procps_pids_new(&info, Items, 3) < 0)
++		    return;
++		while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
++			tid = PIDS_VAL(EU_PID, s_int, stack, info);
++			if (pipewire_pulse_pid == tid)
++				break;
++		}
++		euid = PIDS_VAL(EU_EUID, s_int, stack, info);
++		egid = PIDS_VAL(EU_EGID, s_int, stack, info);
++		procps_pids_unref(&info);
++#endif
+ 
+ 		/* Sanity check: if it can't find the process, it means it has gone */
+-		if (pipewire_pulse_pid != proc_info->tid)
++		if (pipewire_pulse_pid != tid)
+ 			exit(0);
+ 
+-		pw = getpwuid(proc_info->euid);
++		pw = getpwuid(euid);
+ 		homedir = pw->pw_dir;
+-		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid);
+-		setgid(proc_info->egid);
+-		setuid(proc_info->euid);
++		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid);
++		setgid(egid);
++		setuid(euid);
+ 		clearenv();
+ 		setenv("HOME", homedir, 1);
+ 		setenv("XDG_RUNTIME_DIR",xdg_dir, 1);
+-		freeproc(proc_info);
+-
+ 		/*
+ 		 * pw-reserve will run in background. It will only exit when
+ 		 * igt_kill_children() is called later on. So, it shouldn't
+@@ -1570,9 +1687,7 @@ static void pipewire_reserve_wait(void)
+ int pipewire_pulse_start_reserve(void)
+ {
+ 	bool is_pw_reserve_running = false;
+-	proc_t *proc_info;
+ 	int attempts = 0;
+-	PROCTAB *proc;
+ 
+ 	if (!pipewire_pulse_pid)
+ 		return 0;
+@@ -1584,6 +1699,10 @@ int pipewire_pulse_start_reserve(void)
+ 	 * pipewire version 0.3.50 or upper.
+ 	 */
+ 	for (attempts = 0; attempts < PIPEWIRE_RESERVE_MAX_TIME; attempts++) {
++#ifdef HAVE_LIBPROCPS
++		proc_t *proc_info;
++		PROCTAB *proc;
++
+ 		usleep(1000);
+ 		proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
+ 		igt_assert(proc != NULL);
+@@ -1598,6 +1717,25 @@ int pipewire_pulse_start_reserve(void)
+ 			freeproc(proc_info);
+ 		}
+ 		closeproc(proc);
++#endif
++#ifdef HAVE_LIBPROC2
++		enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD };
++		struct pids_info *info = NULL;
++		struct pids_stack *stack;
++
++		usleep(1000);
++
++		if (procps_pids_new(&info, Items, 2) < 0)
++			return 1;
++		while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
++			if (!strcmp(PIDS_VAL(1, str, stack, info), "pw-reserve")) {
++				is_pw_reserve_running = true;
++				pipewire_pw_reserve_pid = PIDS_VAL(0, s_int, stack, info);
++				break;
++			}
++		}
++		procps_pids_unref(&info);
++#endif
+ 		if (is_pw_reserve_running)
+ 			break;
+ 	}
+@@ -1645,7 +1783,7 @@ void pipewire_pulse_stop_reserve(void)
+  * If the check fails, it means that the process can simply be killed.
+  */
+ static int
+-__igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path)
++__igt_lsof_audio_and_kill_proc(const pid_t tid, const char *cmd, const uid_t euid, const gid_t egid, char *proc_path)
+ {
+ 	const char *audio_dev = "/dev/snd/";
+ 	char path[PATH_MAX * 2];
+@@ -1670,10 +1808,10 @@ __igt_lsof_audio_and_kill_proc(proc_t *p
+ 	 * 2) unload/unbind the the audio driver(s);
+ 	 * 3) stop the pw-reserve thread.
+ 	 */
+-	if (!strcmp(proc_info->cmd, "pipewire-pulse")) {
++	if (!strcmp(cmd, "pipewire-pulse")) {
+ 		igt_info("process %d (%s) is using audio device. Should be requested to stop using them.\n",
+-			 proc_info->tid, proc_info->cmd);
+-		pipewire_pulse_pid = proc_info->tid;
++			 tid, cmd);
++		pipewire_pulse_pid = tid;
+ 		return 0;
+ 	}
+ 	/*
+@@ -1685,9 +1823,9 @@ __igt_lsof_audio_and_kill_proc(proc_t *p
+ 	 * will respawn them. So, just ignore here, they'll honor pw-reserve,
+ 	 * when the time comes.
+ 	 */
+-	if (!strcmp(proc_info->cmd, "pipewire-media-session"))
++	if (!strcmp(cmd, "pipewire-media-session"))
+ 		return 0;
+-	if (!strcmp(proc_info->cmd, "wireplumber"))
++	if (!strcmp(cmd, "wireplumber"))
+ 		return 0;
+ 
+ 	dp = opendir(proc_path);
+@@ -1723,22 +1861,22 @@ __igt_lsof_audio_and_kill_proc(proc_t *p
+ 		 * enough to unbind audio modules and won't cause race issues
+ 		 * with systemd trying to reload it.
+ 		 */
+-		if (!strcmp(proc_info->cmd, "pulseaudio")) {
+-			pulseaudio_unload_module(proc_info);
++		if (!strcmp(cmd, "pulseaudio")) {
++			pulseaudio_unload_module(euid, egid);
+ 			break;
+ 		}
+ 
+ 		/* For all other processes, just kill them */
+ 		igt_info("process %d (%s) is using audio device. Should be terminated.\n",
+-				proc_info->tid, proc_info->cmd);
++				tid, cmd);
+ 
+-		if (kill(proc_info->tid, SIGTERM) < 0) {
++		if (kill(tid, SIGTERM) < 0) {
+ 			igt_info("Fail to terminate %s (pid: %d) with SIGTERM\n",
+-				proc_info->cmd, proc_info->tid);
+-			if (kill(proc_info->tid, SIGABRT) < 0) {
++				cmd, tid);
++			if (kill(tid, SIGABRT) < 0) {
+ 				fail++;
+ 				igt_info("Fail to terminate %s (pid: %d) with SIGABRT\n",
+-					proc_info->cmd, proc_info->tid);
++					cmd, tid);
+ 			}
+ 		}
+ 
+@@ -1760,9 +1898,10 @@ int
+ igt_lsof_kill_audio_processes(void)
+ {
+ 	char path[PATH_MAX];
++	int fail = 0;
++#ifdef HAVE_LIBPROCPS
+ 	proc_t *proc_info;
+ 	PROCTAB *proc;
+-	int fail = 0;
+ 
+ 	proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
+ 	igt_assert(proc != NULL);
+@@ -1772,12 +1911,35 @@ igt_lsof_kill_audio_processes(void)
+ 		if (snprintf(path, sizeof(path), "/proc/%d/fd", proc_info->tid) < 1)
+ 			fail++;
+ 		else
+-			fail += __igt_lsof_audio_and_kill_proc(proc_info, path);
++			fail += __igt_lsof_audio_and_kill_proc(proc_info->pid, proc_info->cmd, proc_info->euid, proc_info->egid, path);
+ 
+ 		freeproc(proc_info);
+ 	}
+ 	closeproc(proc);
++#endif
++#ifdef HAVE_LIBPROC2
++	enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD, PIDS_ID_EUID, PIDS_ID_EGID };
++	enum rel_items { EU_PID, EU_CMD, EU_EUID, EU_EGID };
++	struct pids_info *info = NULL;
++	struct pids_stack *stack;
++	pid_t tid;
++
++	if (procps_pids_new(&info, Items, 4) < 0)
++		return 1;
++	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
++		tid = PIDS_VAL(EU_PID, s_int, stack, info);
+ 
++		if (snprintf(path, sizeof(path), "/proc/%d/fd", tid) < 1)
++			fail++;
++		else
++			fail += __igt_lsof_audio_and_kill_proc(tid,
++				PIDS_VAL(EU_CMD, str, stack, info),
++				PIDS_VAL(EU_EUID, s_int, stack, info),
++				PIDS_VAL(EU_EGID, s_int, stack, info),
++				path);
++	}
++	procps_pids_unref(&info);
++#endif
+ 	return fail;
+ }
+ 
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -105,7 +105,6 @@ lib_deps = [
+ 	libdrm,
+ 	libdw,
+ 	libkmod,
+-	libprocps,
+ 	libudev,
+ 	math,
+ 	pciaccess,
+@@ -169,6 +168,12 @@ if chamelium.found()
+ 	lib_sources += 'monitor_edids/monitor_edids_helper.c'
+ endif
+ 
++if libprocps.found()
++	lib_deps += libprocps
++else
++	lib_deps += libproc2
++endif
++
+ if get_option('srcdir') != ''
+     srcdir = join_paths(get_option('srcdir'), 'tests')
+ else
+--- a/meson.build
++++ b/meson.build
+@@ -120,7 +120,15 @@ build_info += 'With libdrm: ' + ','.join
+ 
+ pciaccess = dependency('pciaccess', version : '>=0.10')
+ libkmod = dependency('libkmod')
+-libprocps = dependency('libprocps', required : true)
++libprocps = dependency('libprocps', required : false)
++libproc2 = dependency('libproc2', required : false)
++if libprocps.found()
++  config.set('HAVE_LIBPROCPS', 1)
++elif libproc2.found()
++  config.set('HAVE_LIBPROC2', 1)
++else
++  error('Either libprocps or libproc2 is required')
++endif
+ 
+ libunwind = dependency('libunwind', required : get_option('libunwind'))
+ build_info += 'With libunwind: @0@'.format(libunwind.found())
diff --git a/srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch b/srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch
deleted file mode 100644
index 7cc9e289305c..000000000000
--- a/srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2107b0a53692fb329175bc16169c3699712187aa Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Feb 2021 14:10:41 -0800
-Subject: [PATCH] lib/igt_edid: Allocate raw 8-bytes for VSDB
-
-hdmi_vsdb is an element of cea_vsdb which makes the size of cea_vsdb to
-be 8 ( 3bytes ieee_oui ) + ( 5bytes hdmi_vsdb struct), its true that we
-only use 7 bytes technically we can only allocate 7byte array but since
-we are writing to elements of hdmi_vsdb struct which is sitting at offet
-4-8 in cea_vsdb, compiler thinks we have an element which is out of
-array bounds since out allocated size is 7bytes
-
-This errors out
-../git/lib/igt_edid.c:365:13: error: array subscript 'struct hdmi_vsdb[0]' is partly outside array bounds of 'char[7]' [-Werror=array-bounds]
-  365 |         hdmi->src_phy_addr[0] = 0x10;
-      |             ^~
-
-allocating one extra byte matches with size of cea_vsdb and compiler is
-happy
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Reviewed-by: Martin Peres <martin.peres@mupuf.org>
----
- lib/igt_edid.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/igt_edid.c b/lib/igt_edid.c
-index 1c85486d..ce09cc47 100644
---- a/lib/igt_edid.c
-+++ b/lib/igt_edid.c
-@@ -351,7 +351,7 @@ void cea_sad_init_pcm(struct cea_sad *sad, int channels,
- const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size)
- {
- 	/* We'll generate a VSDB with 2 extension fields. */
--	static char raw[CEA_VSDB_HDMI_MIN_SIZE + 2] = {0};
-+	static char raw[CEA_VSDB_HDMI_MIN_SIZE + 3] = {0};
- 	struct cea_vsdb *vsdb;
- 	struct hdmi_vsdb *hdmi;
- 
--- 
-GitLab
-
diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
deleted file mode 100644
index 142e2fa44fb6..000000000000
--- a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
-From: Petri Latvala <petri.latvala@intel.com>
-Date: Thu, 28 Oct 2021 11:05:31 +0300
-Subject: [PATCH] lib/meson.build: Fix underscorify call
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-f.underscorify() is correct, f.underscorify(f) is an error that later
-meson versions don't like at all.
-
-Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
-Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
-Cc: Arkadiusz Hiler <arek@hiler.eu>
-Signed-off-by: Petri Latvala <petri.latvala@intel.com>
-Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
----
- lib/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/meson.build b/lib/meson.build
-index c3080fc8..297b0ad2 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
- 
- lib_intermediates = []
- foreach f: lib_sources
--    name = f.underscorify(f)
-+    name = f.underscorify()
-     lib = static_library('igt-' + name,
- 	[ f, lib_version ],
- 	include_directories: inc,
--- 
-GitLab
-
diff --git a/srcpkgs/igt-gpu-tools/patches/musl.patch b/srcpkgs/igt-gpu-tools/patches/musl.patch
index 1c1335162e56..615afdb8f8ea 100644
--- a/srcpkgs/igt-gpu-tools/patches/musl.patch
+++ b/srcpkgs/igt-gpu-tools/patches/musl.patch
@@ -1,22 +1,58 @@
+diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c
+index 7e86473e..3156dfc2 100644
+--- a/benchmarks/gem_exec_tracer.c
++++ b/benchmarks/gem_exec_tracer.c
+@@ -271,7 +271,11 @@ static int is_i915(int fd)
+ }
+ 
+ int
++#ifdef __GLIBC__
+ ioctl(int fd, unsigned long request, ...)
++#else
++ioctl(int fd, int request, ...)
++#endif
+ {
+ 	struct trace *t, **p;
+ 	va_list args;
 diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c
-index 7671dc4..3ac9544 100644
+index 312c428b..e0740fc1 100644
 --- a/benchmarks/gem_syslatency.c
 +++ b/benchmarks/gem_syslatency.c
-@@ -44,7 +44,11 @@
- 
+@@ -46,6 +46,8 @@
  #include <linux/unistd.h>
+ #endif
  
--#define sigev_notify_thread_id _sigev_un._tid
-+#ifndef __GLIBC__
-+#include "signal_compat.h"
-+#endif
-+
 +#define sigev_notify_thread_id sigev_notify_function
++
+ #include "i915/gem_create.h"
+ #include "i915/gem_ring.h"
+ #include "igt_aux.h"
+diff --git a/lib/amdgpu/amd_pci_unplug.c b/lib/amdgpu/amd_pci_unplug.c
+index 078398b5..554f489c 100644
+--- a/lib/amdgpu/amd_pci_unplug.c
++++ b/lib/amdgpu/amd_pci_unplug.c
+@@ -21,6 +21,7 @@
+  *
+ */
+ #include <linux/limits.h>
++#include <limits.h> // PATH_MAX
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <pthread.h>
+diff --git a/lib/igt_audio.c b/lib/igt_audio.c
+index e0b1bafe..dd5e0d2c 100644
+--- a/lib/igt_audio.c
++++ b/lib/igt_audio.c
+@@ -26,6 +26,7 @@
  
- static volatile int done;
+ #include "config.h"
  
++#include <limits.h> // PATH_MAX
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <gsl/gsl_fft_real.h>
 diff --git a/lib/igt_aux.c b/lib/igt_aux.c
-index 578f857..3e98cf0 100644
+index 15e30440..9792899d 100644
 --- a/lib/igt_aux.c
 +++ b/lib/igt_aux.c
 @@ -31,6 +31,7 @@
@@ -24,49 +60,60 @@ index 578f857..3e98cf0 100644
  #include <stdio.h>
  #include <fcntl.h>
 +#include <limits.h> // PATH_MAX
+ #include <pwd.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
- #include <string.h>
-@@ -73,6 +74,12 @@
- #include <libgen.h>   /* for dirname() */
- #endif
- 
-+#ifndef __GLIBC__
-+#include "signal_compat.h"
-+#endif
-+
-+//#include <asm-generic/siginfo.h>
-+
- /**
-  * SECTION:igt_aux
-  * @short_description: Auxiliary libraries and support functions
 diff --git a/lib/igt_aux.h b/lib/igt_aux.h
-index 04d2290..a0ada9e 100644
+index e734c87b..b626d28c 100644
 --- a/lib/igt_aux.h
 +++ b/lib/igt_aux.h
-@@ -46,7 +46,7 @@
+@@ -48,7 +48,7 @@
+ # ifndef HAVE_GETTID
  #  define gettid() (pid_t)(syscall(__NR_gettid))
  # endif
+-# define sigev_notify_thread_id _sigev_un._tid
++# define sigev_notify_thread_id sigev_notify_function
  #endif
--#define sigev_notify_thread_id _sigev_un._tid
-+#define sigev_notify_thread_id sigev_notify_function
  
  /* auxialiary igt helpers from igt_aux.c */
- /* generally useful helpers */
+diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
+index ed128d24..ebff1ad3 100644
+--- a/lib/igt_device_scan.c
++++ b/lib/igt_device_scan.c
+@@ -27,6 +27,7 @@
+ #include "igt_list.h"
+ #include "intel_chipset.h"
+ 
++#include <limits.h> // PATH_MAX
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <fcntl.h>
 diff --git a/lib/igt_eld.c b/lib/igt_eld.c
-index 3d7fd4d..d51774b 100644
+index ef6625df..3e9b8a40 100644
 --- a/lib/igt_eld.c
 +++ b/lib/igt_eld.c
-@@ -29,6 +29,7 @@
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ 
+ #include <dirent.h>
++#include <limits.h> // PATH_MAX
+ #include <errno.h>
+ #include <glob.h>
  #include <stdint.h>
- #include <stdio.h>
- #include <string.h>
-+#include <limits.h>
+diff --git a/lib/igt_frame.c b/lib/igt_frame.c
+index 45523a79..86b8aad4 100644
+--- a/lib/igt_frame.c
++++ b/lib/igt_frame.c
+@@ -26,6 +26,7 @@
+ 
+ #include "config.h"
  
- #include "igt_core.h"
- #include "igt_eld.h"
++#include <limits.h> // PATH_MAX
+ #include <fcntl.h>
+ #include <pixman.h>
+ #include <cairo.h>
 diff --git a/lib/igt_halffloat.c b/lib/igt_halffloat.c
-index 08ab05f..7d6a6e6 100644
+index 08ab05fc..7d6a6e6a 100644
 --- a/lib/igt_halffloat.c
 +++ b/lib/igt_halffloat.c
 @@ -162,7 +162,7 @@ static inline float _half_to_float(uint16_t val)
@@ -78,8 +125,20 @@ index 08ab05f..7d6a6e6 100644
  #pragma GCC push_options
  #pragma GCC target("f16c")
  
+diff --git a/lib/igt_hwmon.c b/lib/igt_hwmon.c
+index 309019d6..6216a160 100644
+--- a/lib/igt_hwmon.c
++++ b/lib/igt_hwmon.c
+@@ -2,6 +2,7 @@
+ /*
+  * Copyright © 2022 Intel Corporation
+  */
++#include <limits.h> // PATH_MAX
+ #include <sys/stat.h>
+ #include <sys/sysmacros.h>
+ #include <dirent.h>
 diff --git a/lib/igt_x86.c b/lib/igt_x86.c
-index 6ac700d..ddf5edd 100644
+index 6ac700df..ddf5edda 100644
 --- a/lib/igt_x86.c
 +++ b/lib/igt_x86.c
 @@ -190,7 +190,7 @@ char *igt_x86_features_to_string(unsigned features, char *line)
@@ -91,93 +150,146 @@ index 6ac700d..ddf5edd 100644
  #pragma GCC push_options
  #pragma GCC target("sse4.1")
  #pragma GCC diagnostic ignored "-Wpointer-arith"
-diff --git a/lib/signal_compat.h b/lib/signal_compat.h
-new file mode 100644
-index 0000000..acae648
---- /dev/null
-+++ b/lib/signal_compat.h
-@@ -0,0 +1,4 @@
-+#define SIGEV_SIGNAL    0       /* notify via signal */
-+#define SIGEV_NONE      1       /* other notification: meaningless */
-+#define SIGEV_THREAD    2       /* deliver via thread creation */
-+#define SIGEV_THREAD_ID 4       /* deliver to thread */
-diff --git a/tests/drm_read.c b/tests/drm_read.c
-index cfb1c04..18be922 100644
---- a/tests/drm_read.c
-+++ b/tests/drm_read.c
-@@ -220,7 +220,7 @@ static void test_short_buffer_wakeup(int in, enum pipe pipe)
- 		pthread_mutex_unlock(&w.mutex);
- 
- 		/* Give each thread a chance to sleep in drm_read() */
--		pthread_yield();
-+		sched_yield();
- 
- 		/* One event should wake all threads as none consume */
- 		generate_event(w.fd, pipe);
-diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
-index 8c0d133..f272418 100644
---- a/tests/kms_hdmi_inject.c
-+++ b/tests/kms_hdmi_inject.c
-@@ -25,7 +25,7 @@
+diff --git a/runner/executor.c b/runner/executor.c
+index 9d3623b4..aac3ac56 100644
+--- a/runner/executor.c
++++ b/runner/executor.c
+@@ -1,6 +1,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <limits.h> // PATH_MAX
+ #include <glib.h>
+ #ifdef __linux__
+ #include <linux/watchdog.h>
+diff --git a/runner/runner_tests.c b/runner/runner_tests.c
+index a7e968f8..6d605251 100644
+--- a/runner/runner_tests.c
++++ b/runner/runner_tests.c
+@@ -1,5 +1,6 @@
+ #include <dirent.h>
+ #include <fcntl.h>
++#include <limits.h> // PATH_MAX
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff --git a/tests/device_reset.c b/tests/device_reset.c
+index 39ee8dca..fa8e3b9f 100644
+--- a/tests/device_reset.c
++++ b/tests/device_reset.c
+@@ -3,6 +3,7 @@
+  * Copyright(c) 2020 Intel Corporation. All rights reserved.
+  */
+ #include <fcntl.h>
++#include <limits.h> // PATH_MAX
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
+index 74935430..0dc87d8c 100644
+--- a/tests/i915/i915_pm_rpm.c
++++ b/tests/i915/i915_pm_rpm.c
+@@ -27,6 +27,7 @@
+ 
  #include "config.h"
  
- #include <dirent.h>
--
-+#include <limits.h>
- #include "igt.h"
- #include "igt_edid.h"
- #include "igt_eld.h"
++#include <limits.h> // PATH_MAX
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stdbool.h>
+diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
+index 2a3fb74b..781af5e8 100644
+--- a/tests/kms_atomic.c
++++ b/tests/kms_atomic.c
+@@ -830,7 +830,7 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
+ {
+ 	int timeline, fence_fd;
+ 	void *map;
+-	const ptrdiff_t PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
++	const ptrdiff_t intelsize = sysconf(_SC_PAGE_SIZE);
+ 	uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
+ 
+ 	igt_require_sw_sync();
+@@ -838,28 +838,28 @@ static void crtc_invalid_params_fence(igt_pipe_t *pipe,
+ 	timeline = sw_sync_timeline_create();
+ 
+ 	/* invalid out_fence_ptr */
+-	map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
++	map = mmap(NULL, intelsize, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+ 	igt_assert(map != MAP_FAILED);
+ 
+ 	igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
+ 	crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
+-	munmap(map, PAGE_SIZE);
++	munmap(map, intelsize);
+ 
+ 	/* invalid out_fence_ptr */
+-	map = mmap(NULL, PAGE_SIZE, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
++	map = mmap(NULL, intelsize, PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+ 	igt_assert(map != MAP_FAILED);
+ 
+ 	igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
+ 	crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
+-	munmap(map, PAGE_SIZE);
++	munmap(map, intelsize);
+ 
+ 	/* invalid out_fence_ptr */
+-	map = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
++	map = mmap(NULL, intelsize, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+ 	igt_assert(map != MAP_FAILED);
+ 
+ 	igt_pipe_obj_set_prop_value(pipe, IGT_CRTC_OUT_FENCE_PTR, (ptrdiff_t)map);
+ 	crtc_commit_atomic_err(pipe, plane, ATOMIC_RELAX_NONE, EFAULT);
+-	munmap(map, PAGE_SIZE);
++	munmap(map, intelsize);
+ 
+ 	/* valid in fence but not allowed prop on crtc */
+ 	fence_fd = sw_sync_timeline_create_fence(timeline, 1);
 diff --git a/tests/kms_sysfs_edid_timing.c b/tests/kms_sysfs_edid_timing.c
-index 1201388..e75c7e9 100644
+index 77521108..3b16cba8 100644
 --- a/tests/kms_sysfs_edid_timing.c
 +++ b/tests/kms_sysfs_edid_timing.c
-@@ -24,6 +24,7 @@
+@@ -22,6 +22,7 @@
+  */
+ #include "igt.h"
  
++#include <limits.h> // PATH_MAX
  #include <dirent.h>
  #include <fcntl.h>
-+#include <limits.h>
  #include <sys/stat.h>
- 
- #define THRESHOLD_PER_CONNECTOR	10
-diff --git a/tests/i915/gem_close_race.c b/tests/i915/gem_close_race.c
-index 57e0048..ad5f504 100644
---- a/tests/i915/gem_close_race.c
-+++ b/tests/i915/gem_close_race.c
-@@ -51,7 +51,11 @@
- static uint32_t devid;
- static bool has_64bit_relocations;
- 
--#define sigev_notify_thread_id _sigev_un._tid
-+#ifndef __GLIBC__
-+#include "signal_compat.h"
-+#endif
-+
-+#define sigev_notify_thread_id sigev_notify_function
- 
- static void selfcopy(int fd, uint32_t handle, int loops)
- {
-diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
-index e2c7ba2..08e44b7 100644
---- a/tests/i915/i915_pm_rpm.c
-+++ b/tests/i915/i915_pm_rpm.c
-@@ -36,6 +36,7 @@
+diff --git a/tests/testdisplay.c b/tests/testdisplay.c
+index ee272dfb..b8146b41 100644
+--- a/tests/testdisplay.c
++++ b/tests/testdisplay.c
+@@ -58,6 +58,7 @@
+ #include <strings.h>
  #include <unistd.h>
- #include <fcntl.h>
- #include <dirent.h>
-+#include <limits.h>
+ #include <termios.h>
++#include <limits.h> // PATH_MAX
+ #include <sys/poll.h>
+ #include <sys/time.h>
  #include <sys/ioctl.h>
- #include <sys/mman.h>
+diff --git a/tests/tools_test.c b/tests/tools_test.c
+index 8412ba52..f36a6192 100644
+--- a/tests/tools_test.c
++++ b/tests/tools_test.c
+@@ -26,6 +26,7 @@
  #include <sys/types.h>
-diff --git a/tests/panfrost_submit.c b/tests/panfrost_submit.c
-index 13ce85b..ceb2e6d 100644
---- a/tests/panfrost_submit.c
-+++ b/tests/panfrost_submit.c
-@@ -68,7 +68,7 @@ static void check_error(int fd, struct panfrost_submit *submit)
- static void check_fb(int fd, struct panfrost_bo *bo)
- {
-         int gpu_prod_id = igt_panfrost_get_param(fd, DRM_PANFROST_PARAM_GPU_PROD_ID);
--        __uint32_t *fbo;
-+        uint32_t *fbo;
-         int i;
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h> // PATH_MAX
+ #include <libgen.h>
+ #include <unistd.h>
+ #ifdef __linux__
+diff --git a/tools/igt_compliance_utils.c b/tools/igt_compliance_utils.c
+index 0faf3fc8..f6bd970e 100644
+--- a/tools/igt_compliance_utils.c
++++ b/tools/igt_compliance_utils.c
+@@ -24,6 +24,7 @@
+  */
  
-         fbo = bo->map;
+ #include "igt.h"
++#include <limits.h> // PATH_MAX
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 02f6cc4bba66..225e2c79118a 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -1,11 +1,10 @@
 # Template file for 'igt-gpu-tools'
 pkgname=igt-gpu-tools
-version=1.25
-revision=6
+version=1.27.1
+revision=1
 build_style=meson
-configure_args="-Db_ndebug=false -Db_lto=false"
-# b_lto=true makes the build hang at a random point
-hostmakedepends="pkg-config flex peg python3-docutils gtk-doc"
+configure_args="-Db_ndebug=false -Ddocs=disabled"
+hostmakedepends="pkg-config flex peg python3-docutils"
 makedepends="libdrm-devel libkmod-devel liboping-devel procps-ng-devel libunwind-devel
  elfutils-devel pixman-devel valgrind-devel cairo-devel xmlrpc-c-devel gsl-devel
  alsa-lib-devel json-c-devel libXrandr-devel"
@@ -13,18 +12,15 @@ short_desc="Tools for development and testing of the DRM drivers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11
+changelog="https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/raw/master/NEWS"
+distfiles="${XORG_SITE}/app/igt-gpu-tools-${version}.tar.xz"
+checksum=93b9a4816ed22b5145bb61024314c8a65caeea991ce93027643f1d40723bf417
 # tests don't behave in containers
 make_check=ci-skip
 
 lib32disabled=yes
 archs="i686* x86_64*"
 
-if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
-fi
-
 post_install() {
 	vlicense COPYING
 }

From 0da96cf17ded4433af91b223765a01e0703be05c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 23 Feb 2023 18:00:59 +0000
Subject: [PATCH 060/153] open-vm-tools: remove procps-ng-devel from
 makedepends.

It's not needed anymore, see
https://github.com/vmware/open-vm-tools/commit/ed2e2348dd6af823f9458c5959c89acf2f13a952.
---
 srcpkgs/open-vm-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 8e533e3ae90c..6e4e19bfdd5e 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
 makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
- libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
+ libxerces-c-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
 maintainer="Piraty <mail@piraty.dev>"

From 1f10389ddefabb1acc2234511abb256017118dbc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 May 2023 15:01:53 +0300
Subject: [PATCH 061/153] yaru: update to 23.04.4.

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

diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index ce424065e389..f459721be277 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=23.04.2
+version=23.04.4
 revision=1
 build_style=meson
 configure_args="-Dxfwm4=true"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 changelog="https://raw.githubusercontent.com/ubuntu/yaru/master/debian/changelog"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=dff8ee8dbe6594a58de5444ed4aa98c0a527e5c902fc6b6c747f3db46c78cc6a
+checksum=be00296286426006851e2cdf63dfe8166439cdf2afa22d56035e449cc524412c

From a58eeb83dd61ee57f8c5346e3ed3a50a3683bc48 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 30 Apr 2023 14:42:24 +0200
Subject: [PATCH 062/153] bombardier: update to 1.2.6.

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

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e0dbd6ab95b9..e204deb6a0ce 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,15 +1,16 @@
 # Template file for 'bombardier'
 pkgname=bombardier
-version=1.2.5
-revision=2
+version=1.2.6
+revision=1
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
+go_ldflags=" -X main.version=${version}"
 short_desc="Fast cross-platform HTTP benchmarking tool"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/codesenberg/bombardier"
 distfiles="https://github.com/codesenberg/bombardier/archive/v${version}.tar.gz"
-checksum=4efeac699d0c794ed22fe05b4de5c43fa41f98816682521421d538e076290ed6
+checksum=d908c050132b3a33c3d292a6a3b47d088284a5969376f68f05d7409f51f01e41
 
 post_install() {
 	vlicense LICENSE

From dbe0bff1d587710fe45f1dc08a59de311633fe00 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 30 Apr 2023 01:04:49 -0400
Subject: [PATCH 063/153] miniserve: update to 0.23.2

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

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index f533dd84de8f..48389b909fed 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,6 +1,6 @@
 # Template file for 'miniserve'
 pkgname=miniserve
-version=0.23.1
+version=0.23.2
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://github.com/svenstaro/miniserve"
 changelog="https://raw.githubusercontent.com/svenstaro/miniserve/master/CHANGELOG.md"
 distfiles="https://github.com/svenstaro/miniserve/archive/refs/tags/v${version}.tar.gz"
-checksum=2812e5f700612576587a76ba5ea51a3eb7f60b1dd1b580cd9a015ad2feac5b8f
+checksum=9817f9083cf338d5f165633865d4b5e6c8e7df6267e04c320119548253fb13cb
 make_check=ci-skip  # port binding succeeds locally but fails in CI
 
 case "$XBPS_TARGET_MACHINE" in

From 729edc05ab5cb79bd123a5bd0fdcfbeef288f049 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sun, 30 Apr 2023 11:51:59 +0200
Subject: [PATCH 064/153] aerc: update to 0.15.1

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

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 6a94bb2ead12..8f3768317397 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,6 +1,6 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.15.0
+version=0.15.1
 revision=1
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://aerc-mail.org"
 changelog="https://git.sr.ht/~rjarry/aerc/blob/master/CHANGELOG.md"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=dbeb41abc71d4469da9067d401146843732d9838972067d18f836729006ca033
+checksum=55cd54e45634d684590658ffc14c047cdf7366bbdf163d0445e2f093474ddef5
 ignore_elf_dirs="/usr/share/aerc/filters"
 
 post_install() {

From 8ba916b20e403d214302ad515c51bcf46a72a981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 19 Apr 2023 17:48:41 +0200
Subject: [PATCH 065/153] postfix: update to 3.8.0.

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

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 997a242b9191..3b34e7269ae6 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.7.4
-revision=2
+version=3.8.0
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=4c137a2303448f25993836837deeae87fac5d4d03af11ade8e9bead806328645
+checksum=a3ad8029bd2c6b0c576477a0f77bf9d2c0b761cbaa0efbfef47969efea6eade9
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From c48862ee34c01be4a503598f2207f3e3dc90342c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 16 Apr 2023 11:32:40 +0530
Subject: [PATCH 066/153] gallery-dl: update to 1.25.3.

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

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 14b5839c35a6..050c8e2f5f97 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.25.1
+version=1.25.3
 revision=1
 build_style=python3-module
 make_check_args="--ignore test/test_results.py"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="https://github.com/mikf/gallery-dl/archive/refs/tags/v${version}.tar.gz"
-checksum=fdf5783d92976d5f0a75df6b870a0fd6f67fc43aa9d0432c9970e539f727fda8
+checksum=719ab8a6bf0675b49325858e60109522828ede77de0c231d773e3e5626229392
 
 pre_build() {
 	make man completion

From f7a65ea9a880fa43e784e4b46c0b69d9997171d1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 May 2023 21:25:59 +0300
Subject: [PATCH 067/153] skype: update to 8.97.0.204.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index c933eea05576..908f4addd4e5 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.96.0.409
+version=8.97.0.204
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=bb42be049566ac17a7398ffb12712127e701358f2d14547634ad20290e6cca02
+checksum=5b2fbb303db5cc10b90713a404cb6cedf227cc0b0e6f16599b513853127ba984
 repository="nonfree"
 nostrip="yes"
 

From d8aba84eedc9852da7aeb8240600d4b22b9315fe Mon Sep 17 00:00:00 2001
From: "Moizes J. Sousa" <milyth@proton.me>
Date: Mon, 24 Apr 2023 16:21:33 -0300
Subject: [PATCH 068/153] zfs: update to 2.1.11.

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

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index ae975caf9dd9..914114f1cfb7 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.9
+version=2.1.11
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6
+checksum=a54fe4e854d0a207584f1799a80e165eae66bc30dc8e8c96a1f99ed9d4d8ceb2
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From f8f49a9663616371a92d368b284c2442bf3dcda6 Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Mon, 1 May 2023 20:09:27 +0200
Subject: [PATCH 069/153] texstudio: update to 4.5.2.

---
 .../patches/30-disable-auto-update.patch      | 39 +++++++++++--------
 srcpkgs/texstudio/template                    |  4 +-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/texstudio/patches/30-disable-auto-update.patch b/srcpkgs/texstudio/patches/30-disable-auto-update.patch
index 78ad6e8896ff..3b31cef469b9 100644
--- a/srcpkgs/texstudio/patches/30-disable-auto-update.patch
+++ b/srcpkgs/texstudio/patches/30-disable-auto-update.patch
@@ -1,26 +1,31 @@
-#initially based on debian's patch: https://sources.debian.net/patches/texstudio/2.11.2+debian-1/
-#modification: in Settings menu: disable whole groupBox instead of all single elements
+diff --git a/src/configdialog.ui b/src/configdialog.ui
+index f08ca462f..ef8a83e91 100644
 --- a/src/configdialog.ui
 +++ b/src/configdialog.ui
-@@ -485,6 +485,9 @@
-            </item>
-            <item>
-             <widget class="QGroupBox" name="groupBox_Update">
-+             <property name="enabled">
-+              <bool>false</bool>
-+             </property>
-              <property name="title">
-               <string>Update</string>
-              </property>
-
+@@ -500,6 +500,9 @@
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="groupBox_Update">
++                 <property name="enabled">
++                  <bool>false</bool>
++                 </property>
+                  <property name="title">
+                   <string>Update</string>
+                  </property>
+diff --git a/src/configmanager.cpp b/src/configmanager.cpp
+index a67f28cfa..80622ecea 100644
 --- a/src/configmanager.cpp
 +++ b/src/configmanager.cpp
-@@ -477,7 +477,7 @@
- 	registerOption("Thesaurus/Database", &thesaurus_database, "<dic not found>", &pseudoDialog->comboBoxThesaurusFileName);
+@@ -508,10 +508,12 @@ ConfigManager::ConfigManager(QObject *parent): QObject (parent),
+     registerOption("Macros/RepositoryURL", &URLmacroRepository, "https://api.github.com/repos/texstudio-org/texstudio-macro/contents/", nullptr);
  
  	//updates
--	registerOption("Update/AutoCheck", &autoUpdateCheck, true, &pseudoDialog->checkBoxAutoUpdateCheck);
-+	registerOption("Update/AutoCheck", &autoUpdateCheck, false, &pseudoDialog->checkBoxAutoUpdateCheck);
++	/*
+ 	registerOption("Update/AutoCheck", &autoUpdateCheck, true, &pseudoDialog->checkBoxAutoUpdateCheck);
  	registerOption("Update/UpdateLevel", &updateLevel, 0, &pseudoDialog->comboBoxUpdateLevel);
  	registerOption("Update/AutoCheckInvervalDays", &autoUpdateCheckIntervalDays, 7, &pseudoDialog->spinBoxAutoUpdateCheckIntervalDays);
  	registerOption("Update/LastCheck", &lastUpdateCheck, QDateTime());
++	*/
+ 
+ 	//editor
+ 	registerOption("Editor/WordWrapMode", &editorConfig->wordwrap, 1, &pseudoDialog->comboBoxLineWrap);
diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 8cc39fc09467..1011e07cf185 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,6 +1,6 @@
 # Template file for 'texstudio'
 pkgname=texstudio
-version=4.4.1
+version=4.5.2
 revision=1
 build_style=qmake
 configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://texstudio.org/"
 changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt"
 distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz"
-checksum=83c46c971081c053a01a186b4a7fbb492d75bef4070ff8fa045311eda186562b
+checksum=d43dd21a111aacf57e40b0ee27c94b9923f8fdbddec5bad919596abf9a03f3cf
 
 build_options="phonon poppler"
 desc_option_phonon="build with phonon (=media support for pdf preview)"

From 0cdc8ccd604dc13f333829023c6d140dd5799253 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 28 Apr 2023 05:44:22 +0200
Subject: [PATCH 070/153] limine: update to 4.20230428.0.

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

diff --git a/srcpkgs/limine/template b/srcpkgs/limine/template
index 06bcf25f033d..1fad25363c8a 100644
--- a/srcpkgs/limine/template
+++ b/srcpkgs/limine/template
@@ -1,6 +1,6 @@
 # Template file for 'limine'
 pkgname=limine
-version=4.20230330.0
+version=4.20230428.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-all TOOLCHAIN_FOR_TARGET=llvm"
@@ -10,7 +10,7 @@ maintainer="Mintsuki <mintsuki@protonmail.com>"
 license="BSD-2-Clause"
 homepage="https://limine-bootloader.org/"
 distfiles="https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.xz"
-checksum=1270145c65adc3933e220ca87a7aaca0e14a5dec18b2821f4ddc9ecdeedbdcb2
+checksum=8771a86769a3405dad729cabceac0a76316964c40dc2f0690398b1e6e01aae41
 
 post_install() {
 	vlicense LICENSE

From 04b26b7f6f2dba3cdc8d6b0d6bb6ddfa7d71e2ed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 2 May 2023 03:44:26 -0400
Subject: [PATCH 071/153] handlr: rebuild for missing x86_64/i686 pkg

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

diff --git a/srcpkgs/handlr/template b/srcpkgs/handlr/template
index d346fc4fbbc6..8cbea310a56d 100644
--- a/srcpkgs/handlr/template
+++ b/srcpkgs/handlr/template
@@ -1,7 +1,7 @@
 # Template file for 'handlr'
 pkgname=handlr
 version=0.6.4
-revision=1
+revision=2
 build_style=cargo
 depends="shared-mime-info"
 checkdepends="shared-mime-info"

From 48dba2508995fdacacc25780ce43c730197eca42 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 May 2023 06:56:14 -0500
Subject: [PATCH 072/153] sqlmap: update to 1.7.5.

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

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

From 97ebcfefc36ad6bb3edf390f41e8fbc43bcd106d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?andr=C3=A9?= <andrelcmoreira@disroot.org>
Date: Tue, 2 May 2023 00:32:25 -0300
Subject: [PATCH 073/153] newsboat: adopt

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

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 978d6b63cd91..45d0b355d5ed 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -12,7 +12,7 @@ makedepends="json-c-devel libcurl-devel libxml2-devel sqlite-devel stfl-devel
  rust-std"
 checkdepends="ncurses-base"
 short_desc="RSS/Atom feed reader for the text console"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André L. C. Moreira <andrelcmoreira@disroot.org>"
 license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"

From 1a3b185c39c55635dd5aedf89b009ae178be1909 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 1 May 2023 20:22:15 +0200
Subject: [PATCH 074/153] tuxedo-keyboard: update to 3.2.3

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

diff --git a/srcpkgs/tuxedo-keyboard/template b/srcpkgs/tuxedo-keyboard/template
index 817508f906f4..c72f78b9c867 100644
--- a/srcpkgs/tuxedo-keyboard/template
+++ b/srcpkgs/tuxedo-keyboard/template
@@ -1,6 +1,6 @@
 # Template file for 'tuxedo-keyboard'
 pkgname=tuxedo-keyboard
-version=3.2.1
+version=3.2.3
 revision=1
 depends="dkms"
 short_desc="TUXEDO kernel module drivers for keyboard & general hardware I/O"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tuxedocomputers/tuxedo-keyboard"
 distfiles="https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v${version}.tar.gz"
-checksum=baa2b8e9edd108422cb9fb2859459bb9ca04cc9fa15fd1b9828f69047c76a4fe
+checksum=dcad92d748e0d28ea0fb34d2933724e870f93509c816114d56f224d5abddc4bf
 
 dkms_modules="tuxedo-keyboard ${version}"
 

From 837d3fe80949e91b105f0b7c75d581969bac9b71 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 1 May 2023 11:15:14 +0200
Subject: [PATCH 075/153] rest-server: update to 0.12.0.

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

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 8f0db5cc45ff..9868880d1732 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"
@@ -10,7 +10,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/restic/rest-server"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=cd9b35ad2224244207a967ebbc78d84f4298d725e95c1fa9341ed95a350ea68f
+checksum=1032d6bfd8847f99027c748c0ae8e3a5993534a924069aa23e5b99954118f8c7
 system_accounts="_restserver"
 _restserver_homedir="/var/lib/rest-server"
 _restserver_descr="Rest Server Daemon User"

From 496e9f4ea7e9e11bee8c357e441b4abc00223ddd Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 1 May 2023 11:17:07 +0200
Subject: [PATCH 076/153] hcloud: update to 1.33.1.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 945999b3870f..8307a8578f4e 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.32.0
-revision=2
+version=1.33.1
+revision=1
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=4354a81f6a6227cf4b2ffba09e769a4898c572d2b85a579a77b7a09506345a86
+checksum=bbd337684b51ecd6848f6b7531f3a2793c43d0fbe2ece13f153ce1504a1e72f6
 
 post_install() {
 	vlicense LICENSE

From 7cbab1b08c529330bf01a74613177c78d23fc45d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 2 May 2023 12:46:07 -0400
Subject: [PATCH 077/153] chezmoi: update to 2.33.4.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a211af794e72..9cfe3a80c8b7 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.33.3
+version=2.33.4
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://chezmoi.io/"
 changelog="https://github.com/twpayne/chezmoi/releases"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=cdb09755c3f5bf9a29b8173255752b9d5646eed590abae1f7f88b31f636b3384
+checksum=551a1ddb1e790880415cabfd9d718be47760b8018fb63cddf5cd2145db0b5947
 
 pre_build() {
 	local _date

From 04145b8b3e6528d08a2661d8ccbd1987bd4573b0 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 1 May 2023 20:07:50 +0300
Subject: [PATCH 078/153] gptfdisk: fix sgdisk crashing with popt-1.19.

Fixes #43677.
---
 .../gptfdisk/patches/fix-sgdisk-crash.patch   | 97 +++++++++++++++++++
 srcpkgs/gptfdisk/template                     |  2 +-
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gptfdisk/patches/fix-sgdisk-crash.patch

diff --git a/srcpkgs/gptfdisk/patches/fix-sgdisk-crash.patch b/srcpkgs/gptfdisk/patches/fix-sgdisk-crash.patch
new file mode 100644
index 000000000000..c38bb56a259b
--- /dev/null
+++ b/srcpkgs/gptfdisk/patches/fix-sgdisk-crash.patch
@@ -0,0 +1,97 @@
+From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Fri, 15 Apr 2022 18:10:14 -0400
+Subject: [PATCH 1/2] Fix failure & crash of sgdisk when compiled with latest
+ popt (commit 740; presumably eventually release 1.19)
+
+---
+ NEWS      | 8 ++++++++
+ gptcl.cc  | 2 +-
+ support.h | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index c7add56..9e153fd 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,11 @@
++1.0.10 (?/??/2022):
++-------------------
++
++- Fixed problem that caused sgdisk to crash with errors about being unable
++  to read the disk's partition table when compiled with the latest popt
++  (commit 740, which is pre-release as I type; presumably version 1.19 and
++  later once released).
++
+ 1.0.9 (4/14/2022):
+ ------------------
+ 
+diff --git a/gptcl.cc b/gptcl.cc
+index 34c9421..0d578eb 100644
+--- a/gptcl.cc
++++ b/gptcl.cc
+@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+    } // while
+ 
+    // Assume first non-option argument is the device filename....
+-   device = (char*) poptGetArg(poptCon);
++   device = strdup((char*) poptGetArg(poptCon));
+    poptResetContext(poptCon);
+ 
+    if (device != NULL) {
+diff --git a/support.h b/support.h
+index 8ba9ad1..f91f1bc 100644
+--- a/support.h
++++ b/support.h
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ #include <string>
+ 
+-#define GPTFDISK_VERSION "1.0.9"
++#define GPTFDISK_VERSION "1.0.9.1"
+ 
+ #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
+ // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
+-- 
+2.40.1
+
+From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001
+From: Damian Kurek <starfire24680@gmail.com>
+Date: Thu, 7 Jul 2022 03:39:16 +0000
+Subject: [PATCH 2/2] Fix NULL dereference when duplicating string argument
+
+poptGetArg can return NULL if there are no additional arguments, which
+makes strdup dereference NULL on strlen
+---
+ gptcl.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gptcl.cc b/gptcl.cc
+index 0d578eb..ab95239 100644
+--- a/gptcl.cc
++++ b/gptcl.cc
+@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+    } // while
+ 
+    // Assume first non-option argument is the device filename....
+-   device = strdup((char*) poptGetArg(poptCon));
+-   poptResetContext(poptCon);
++   device = (char*) poptGetArg(poptCon);
+ 
+    if (device != NULL) {
++      device = strdup(device);
++      poptResetContext(poptCon);
+       JustLooking(); // reset as necessary
+       BeQuiet(); // Tell called functions to be less verbose & interactive
+       if (LoadPartitions((string) device)) {
+@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+          cerr << "Error encountered; not saving changes.\n";
+          retval = 4;
+       } // if
++      free(device);
+    } // if (device != NULL)
+    poptFreeContext(poptCon);
+    return retval;
+-- 
+2.40.1
+
diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index a760af49bcc0..443cf57957ca 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'gptfdisk'
 pkgname=gptfdisk
 version=1.0.9
-revision=1
+revision=2
 build_style=gnu-makefile
 make_check_target=test
 makedepends="ncurses-devel popt-devel libuuid-devel"

From 65c74cb71c4e827436bd971b8975c6d7de9d2377 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 30 Apr 2023 22:23:20 +0200
Subject: [PATCH 079/153] topgrade: update to 11.0.2

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

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 6995c8a7b429..a62587dcb8de 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=10.3.3
+version=11.0.2
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -9,7 +9,7 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/topgrade-rs/topgrade"
 distfiles="https://github.com/topgrade-rs/topgrade/archive/refs/tags/v${version}.tar.gz"
-checksum=a6477aeade723aa16b0e4e03d4ea4b905fb256823ef578cf7c7e3ee24cca01ca
+checksum=29cd1d870dafbfa46d07c4056ba229a98755660a2e37804f12e1507fdde7d237
 
 post_install() {
 	local topgrade="${DESTDIR}/usr/bin/topgrade"

From a091df032a811acefd595ff8024fb357a955b0e9 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 3 May 2023 01:02:22 +0000
Subject: [PATCH 080/153] quixand: fix url.

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

diff --git a/srcpkgs/quixand/template b/srcpkgs/quixand/template
index 1f4151e132e6..1dbaf18d8734 100644
--- a/srcpkgs/quixand/template
+++ b/srcpkgs/quixand/template
@@ -6,8 +6,8 @@ depends="bash encfs"
 short_desc="Tool for creating single-use unrecoverable encrypted sandboxes"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="GPL-2.0-only"
-homepage="https://xyne.archlinux.ca/projects/quixand/"
-distfiles="https://xyne.archlinux.ca/projects/quixand/src/${pkgname}-${version}.tar.xz"
+homepage="https://xyne.dev/projects/quixand"
+distfiles="https://xyne.dev/projects/quixand/src/${pkgname}-${version}.tar.xz"
 checksum=470fac15b0f4f9c6e4cdf2be360cb4e9325ec319494991e8550b3d1d0b0226e1
 
 do_install() {

From 34398bd8e62f2d7e0b2c7804299ab96142c91393 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 2 May 2023 13:02:38 -0400
Subject: [PATCH 081/153] nerd-fonts: update to 3.0.0

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

diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template
index 1143268154ae..555786ba8679 100644
--- a/srcpkgs/nerd-fonts/template
+++ b/srcpkgs/nerd-fonts/template
@@ -1,14 +1,15 @@
 # Template file for 'nerd-fonts'
 pkgname=nerd-fonts
-version=2.3.3
-revision=2
+version=3.0.0
+revision=1
 depends="nerd-fonts-ttf nerd-fonts-otf"
 short_desc="Iconic font aggregator, collection and patcher"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://nerdfonts.com"
+changelog="https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/changelog.md"
 distfiles="https://github.com/ryanoasis/nerd-fonts/archive/refs/tags/v${version}.tar.gz"
-checksum=d51ebe538c78e7e7c24818a433a943c7699f9da38c179f91bd9319962cf48cde
+checksum=994e953cd69e2fd114ce79af422354b14b95418191365f99e11987c55e487243
 
 do_install() {
 	vmkdir usr/share/fonts/NerdFonts/otf
@@ -19,9 +20,6 @@ do_install() {
 	find patched-fonts -name '*.otf' -exec install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/NerdFonts/otf \;
 	find patched-fonts -name '*.ttf' -exec install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/NerdFonts/ttf \;
 
-	# remove windows-compatible fonts
-	find ${DESTDIR}/usr/share/fonts/NerdFonts -name '*Windows Compatible.*tf' -delete
-
 	# install patching scripts
 	for sh in bin/scripts/lib/i_*.sh; do
 		vinstall $sh 744 usr/lib/NerdFonts

From afa158488637d310a2fd1510de1ab20a93040f23 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 2 May 2023 22:40:27 +0530
Subject: [PATCH 082/153] lazygit: update to 0.38.1.

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

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index ac3d62c19540..77ca7aaf2703 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.37.0
-revision=2
+version=0.38.1
+revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
@@ -10,8 +10,9 @@ short_desc="Simple terminal UI for git commands"
 maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
+changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
-checksum=8545f3cffe110de80c88859cd11b42eaccb71f4c239c5bc2bff841f623438296
+checksum=144f55267df7d51be9ae1dc3313707a7f6bcdf0c42eb330667c1fd661dec01b8
 
 post_install() {
 	vlicense LICENSE

From 12196e3c5f14108d936c2b12a6c26b2770f33b0c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 1 May 2023 23:02:49 +0200
Subject: [PATCH 083/153] lf: update to r29.

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

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 3938f5b93288..585e097bfa77 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
-version=r28
-revision=2
+version=r29
+revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=0ccfd2a024a3718d53ec1ed2470053b81bf824fa8b7e824d3b96eb796fc73ab6
+checksum=82ec6e926941e1819aecaace32ed9a57597b714b5bbc5ff98dd519f1fa2239fa
 
 post_install() {
 	vlicense LICENSE

From 8557586a413208278143d2d1bc858027fd731423 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 2 May 2023 22:42:54 +0530
Subject: [PATCH 084/153] qsv: update to 0.101.0.

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

diff --git a/srcpkgs/qsv/template b/srcpkgs/qsv/template
index a0cfea753f43..e20ba7c394f1 100644
--- a/srcpkgs/qsv/template
+++ b/srcpkgs/qsv/template
@@ -1,6 +1,6 @@
 # Template file for 'qsv'
 pkgname=qsv
-version=0.100.0
+version=0.101.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -12,5 +12,4 @@ license="Unlicense"
 homepage="https://github.com/jqnatividad/qsv"
 changelog="https://raw.githubusercontent.com/jqnatividad/qsv/master/CHANGELOG.md"
 distfiles="https://github.com/jqnatividad/qsv/archive/refs/tags/${version}.tar.gz"
-checksum=08e0825bbe3fb78f6696ce79f7e4ad7c79a7140b12819a28bb4ead4909525efd
-make_check=ci-skip # should be fixed next release
+checksum=fcdf757ea71939cd4774b7e94d126ff1d4340c34bd8c96060624357d26788b0a

From 77e7f1a38f8cc8e74d02c0cc133d473ca7772386 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 2 May 2023 01:08:13 +0530
Subject: [PATCH 085/153] himalaya: update to 0.7.3.

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

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index 391433ec04ba..4bafe8d2f2c5 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,17 +1,17 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="openssl-devel"
+makedepends="sqlite-devel"
 short_desc="CLI email client"
 maintainer="Gadzhi Kharkharov <me@kkga.me>"
 license="MIT"
-homepage="https://github.com/soywod/himalaya"
+homepage="https://pimalaya.org/himalaya/"
 changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md"
 distfiles="https://github.com/soywod/himalaya/archive/refs/tags/v${version}.tar.gz"
-checksum=79ad75e765a5298c5c597beb175cec1d2982eead2172bc78daa7a9f159c99861
+checksum=5bfadca9d6141834c3a97d53a43bdd317e59ee4f893bcc00e6fcbf9fc0f5b55a
 
 post_install() {
 	vlicense LICENSE

From b0262e4e62a06775c12d928f8434e876a0c79c06 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 May 2023 14:49:04 +0300
Subject: [PATCH 086/153] xfce4-whiskermenu-plugin: update to 2.7.3.

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

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 37a293e33018..2a6a6a0ef69d 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
-version=2.7.2
+version=2.7.3
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=158571a510a973a68a8b18611a0611b37bae1dda548ef953210ca8f94a3ff98b
+checksum=da2699ec9665388cf7fa1090088290f78245667fa6846ffca14116264a9fe6e9

From d85cea6195d82061a1874310add8eb15ba1bf29f Mon Sep 17 00:00:00 2001
From: Stefan Kreutz <mail@skreutz.com>
Date: Fri, 21 Apr 2023 14:45:55 +0200
Subject: [PATCH 087/153] lychee: update to 0.12.0.

---
 srcpkgs/lychee/patches/cargo-lock.patch | 85 +++++++++++++++++++++++++
 srcpkgs/lychee/template                 | 11 +---
 2 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/lychee/patches/cargo-lock.patch

diff --git a/srcpkgs/lychee/patches/cargo-lock.patch b/srcpkgs/lychee/patches/cargo-lock.patch
new file mode 100644
index 000000000000..420bdaa1838e
--- /dev/null
+++ b/srcpkgs/lychee/patches/cargo-lock.patch
@@ -0,0 +1,85 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 3ef964d..d11a716 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -517,9 +517,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.78"
++version = "1.0.79"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+ 
+ [[package]]
+ name = "cfg-if"
+@@ -805,9 +805,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "crossbeam-channel"
+-version = "0.5.6"
++version = "0.5.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
++checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+ dependencies = [
+  "cfg-if",
+  "crossbeam-utils",
+@@ -1247,7 +1247,7 @@ dependencies = [
+  "futures-sink",
+  "nanorand",
+  "pin-project",
+- "spin 0.9.4",
++ "spin 0.9.8",
+ ]
+ 
+ [[package]]
+@@ -1469,9 +1469,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "h2"
+-version = "0.3.17"
++version = "0.3.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
++checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -2333,9 +2333,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+ 
+ [[package]]
+ name = "openssl"
+-version = "0.10.44"
++version = "0.10.49"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
++checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33"
+ dependencies = [
+  "bitflags 1.3.2",
+  "cfg-if",
+@@ -2365,9 +2365,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+ 
+ [[package]]
+ name = "openssl-src"
+-version = "111.24.0+1.1.1s"
++version = "111.25.2+1.1.1t"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd"
++checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431"
+ dependencies = [
+  "cc",
+ ]
+@@ -3273,9 +3273,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+ 
+ [[package]]
+ name = "spin"
+-version = "0.9.4"
++version = "0.9.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
++checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+ dependencies = [
+  "lock_api",
+ ]
diff --git a/srcpkgs/lychee/template b/srcpkgs/lychee/template
index d2b0a1081682..5e88ee5670cc 100644
--- a/srcpkgs/lychee/template
+++ b/srcpkgs/lychee/template
@@ -1,6 +1,6 @@
 # Template file for 'lychee'
 pkgname=lychee
-version=0.11.1
+version=0.12.0
 revision=1
 build_style=cargo
 make_install_args="--path lychee-bin"
@@ -12,14 +12,7 @@ license="Apache-2.0, MIT"
 homepage="https://lychee.cli.rs"
 changelog="https://github.com/lycheeverse/lychee/releases"
 distfiles="https://github.com/lycheeverse/lychee/archive/refs/tags/v${version}.tar.gz"
-checksum=b5ed41f8c91e888d1aab841df6adb265281344ebf0ac9ab9050b11700fd84d7e
-
-pre_build() {
-	cargo update --package spin@0.9.4 --precise 0.9.8
-	cargo update --package openssl@0.10.44 --precise 0.10.49
-	cargo update --package tempfile@3.3.0 --precise 3.4.0
-	cargo update --package openssl-src@111.24.0+1.1.1s --precise 111.25.2+1.1.1t
-}
+checksum=2d8a08e6d64d24f7bceacf12e4d097c599bf1fbc40a146671eae4b638cde1f47
 
 post_install() {
 	vlicense LICENSE-APACHE

From 7caea420719cf09365b13a2e69ad6d4cb0da043f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 21 Apr 2023 21:27:43 +0530
Subject: [PATCH 088/153] python3-watchdog: update to 3.0.0.

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

diff --git a/srcpkgs/python3-watchdog/template b/srcpkgs/python3-watchdog/template
index 66eb30387ae3..c5b6e59a0897 100644
--- a/srcpkgs/python3-watchdog/template
+++ b/srcpkgs/python3-watchdog/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-watchdog'
 pkgname=python3-watchdog
-version=2.2.1
+version=3.0.0
 revision=1
 build_style=python3-module
 make_check_args="--deselect tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/gorakhargosh/watchdog"
 changelog="https://raw.githubusercontent.com/gorakhargosh/watchdog/master/changelog.rst"
 distfiles="${PYPI_SITE}/w/watchdog/watchdog-${version}.tar.gz"
-checksum=cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f
+checksum=4d98a320595da7a7c5a18fc48cb633c2e73cda78f93cac2ef42d42bf609a33f9
 conflicts="python-watchdog>=0"
 
 pre_check() {

From 88467c6101e946aded1f0954ca62b0b700e4dded Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 18 Apr 2023 22:23:40 +0100
Subject: [PATCH 089/153] python3-pygit2: fix cross build.

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

diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index e95cda9aa1aa..307a83fff604 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -3,8 +3,8 @@ pkgname=python3-pygit2
 version=1.10.1
 revision=2
 build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools"
-makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi libssh2-devel
+hostmakedepends="pkg-config python3-devel python3-setuptools python3-cffi"
+makedepends="python3-devel libgit2-devel python3-cached-property libssh2-devel
  openssl-devel"
 depends="python3-cached-property python3-cffi"
 checkdepends="python3-pytest"

From a0524a809afabb89769c0d5bee71877d1405cf9a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 18 Apr 2023 21:53:16 +0100
Subject: [PATCH 090/153] etesync-dav: fix build.

---
 .../etesync-dav/patches/add-missing-colon.diff    | 15 +++++++++++++++
 srcpkgs/etesync-dav/template                      |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/etesync-dav/patches/add-missing-colon.diff

diff --git a/srcpkgs/etesync-dav/patches/add-missing-colon.diff b/srcpkgs/etesync-dav/patches/add-missing-colon.diff
new file mode 100644
index 000000000000..3938c57abc81
--- /dev/null
+++ b/srcpkgs/etesync-dav/patches/add-missing-colon.diff
@@ -0,0 +1,15 @@
+See https://github.com/etesync/etesync-dav/pull/293.
+
+diff --git a/setup.py b/setup.py
+index a69cd1a..77c7fc5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -115,7 +115,7 @@ INSTALL_REQUIRES = [
+     'Flask>=1.1.1',
+     'Flask-WTF>=0.14.2,<1.0.0',
+     'requests[socks]>=2.21',
+-    'types-setuptools>=50.0.0'
++    'types-setuptools>=50.0.0',
+     'pyobjc-framework-Cocoa>=7.0.0 ; sys_platform=="darwin"',
+ ]
+ 
diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index 667f5ec8563a..d87b0fe51da3 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -9,7 +9,8 @@ checkdepends="$depends python3-pytest"
 short_desc="CalDAV and CardDAV frontend for EteSync"
 maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 license="GPL-3.0-only"
-homepage="http://www.etesync.com"
+homepage="https://www.etesync.com"
+changelog="https://raw.githubusercontent.com/etesync/etesync-dav/master/ChangeLog.md"
 distfiles="${PYPI_SITE}/e/etesync-dav/etesync-dav-${version}.tar.gz"
 checksum=a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720
-make_check=no #there are no tests to run
+make_check=no # there are no tests to run

From 710fde2b4ddd9bf6f0df461d5892fc7bd1d83b24 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 16 Apr 2023 00:11:15 +0530
Subject: [PATCH 091/153] hstr: update to 3.1.

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

diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index 8babb38010e6..7927fe7ec830 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,6 +1,6 @@
 # Template file for 'hstr'
 pkgname=hstr
-version=2.6
+version=3.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="https://github.com/dvorka/hstr"
 changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
 distfiles="https://github.com/dvorka/hstr/archive/refs/tags/${version}.tar.gz"
-checksum=085f8a087481bcdf33e75e2fa5aaa9289931782c0bee2db3e02425b9a7d83cdf
+checksum=e5293d4fe2502662f19c793bef416e05ac020490218e71c75a5e92919c466071
 
 pre_configure() {
 	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h

From f193cf87c4400a9807767eb4b320a62564b8dc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=2E=20S=C3=A1nchez?= <o-sanchez@linuxmail.org>
Date: Fri, 14 Apr 2023 02:00:46 -0600
Subject: [PATCH 092/153] nnn: update to 4.8

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

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 33db80a43518..e556be4fe285 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.7
+version=4.8
 revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=81ccccc045bfd7ee3f1909cc443158ea0d1833f77d6342fd19c33864a2ab71d1
+checksum=0a744e67a0ce8b5e1e04961f542d2c33ddb6ceed46ba760dd35c4922b21f1146
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"

From 76a93ca4cc232e357018715352ef4b5aa477258e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 13 Apr 2023 11:14:49 +0200
Subject: [PATCH 093/153] zellij: update to 0.36.0

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

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 6c989e239b91..74eaf1a73da7 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.35.2
+version=0.36.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://raw.githubusercontent.com/zellij-org/zellij/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/refs/tags/v${version}.tar.gz"
-checksum=8255a92e40892856bc7dd7114958b8525a88dedab159b588f9907e4d4a2f27e9
+checksum=df64fa143c10f3c7c3e53befeb6ab3b8f08c220f3cf6331cfc6faa2aa779b6b1
 make_check_pre="env LIBSSH2_SYS_USE_PKG_CONFIG=1"
 
 post_install() {

From ef56d53e7aae94c52e023592cfeb88ea641b869c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 2 Apr 2023 16:10:07 +0300
Subject: [PATCH 094/153] font-awesome6: update to 6.4.0.

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

diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
index 4388beb53209..843efb10f230 100644
--- a/srcpkgs/font-awesome6/template
+++ b/srcpkgs/font-awesome6/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome6'
 pkgname=font-awesome6
-version=6.2.1
+version=6.4.0
 revision=1
 hostmakedepends="font-util"
 short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
@@ -9,7 +9,7 @@ license="OFL-1.1"
 homepage="https://fontawesome.com/"
 changelog="https://fontawesome.com/docs/changelog/"
 distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
-checksum=518fefd95bba1095c3ad7df5b886966ec9e172f528a5279fca1c1c5e35e1bc56
+checksum=128b850cef31dd9c21f42dc19b028a02302408659dc0350c5111ea126f6c00ae
 font_dirs="/usr/share/fonts/OTF"
 
 do_install() {

From 7d150b17f6193f905eb70c7fe0618f9c2ebed5fe Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Sat, 1 Apr 2023 20:58:11 -0300
Subject: [PATCH 095/153] highlight: update to 4.5

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

diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template
index d308896a2d63..6dfaeb7af2d2 100644
--- a/srcpkgs/highlight/template
+++ b/srcpkgs/highlight/template
@@ -1,6 +1,6 @@
 # Template file for 'highlight'
 pkgname=highlight
-version=4.4
+version=4.5
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config swig perl"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php"
 changelog="http://www.andre-simon.de/doku/highlight/en/changelog.php"
 distfiles="http://www.andre-simon.de/zip/highlight-${version}.tar.bz2"
-checksum=9682336941db6b081c9be616ee778fc306386ddd2ed87881db87578bfa2a39ba
+checksum=7763f46927616690e3ecc718827458d119414436d4d6462c8997942d0a211172
 # No check target, fails spectacularly when asked
 make_check=no
 conf_files="/etc/highlight/filetypes.conf"

From 1dcbdec2fb71aa52fe99c9be9be09341f3d298b1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 30 Mar 2023 13:25:15 +0530
Subject: [PATCH 096/153] httpdirfs: update to 1.2.5.

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

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 4aaab3d36adb..a4687feab17b 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,6 +1,6 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
-version=1.2.4
+version=1.2.5
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -13,15 +13,10 @@ license="GPL-3.0-only"
 homepage="https://github.com/fangfufu/httpdirfs"
 changelog="https://raw.githubusercontent.com/fangfufu/httpdirfs/master/CHANGELOG.md"
 distfiles="https://github.com/fangfufu/httpdirfs/archive/refs/tags/${version}.tar.gz"
-checksum=c55b1020af76c6303e441c4529726396ca14e001941791df4046daa6a5a34877
+checksum=d0a85600c3813064ba3cad9491b66fcf458151a49d3926818f5458ab6f615038
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 
-pre_configure() {
-	vsed -e "s,^VERSION\s\+=.*,VERSION = ${version}," -i Makefile
-	vsed -e "s,-fsanitize=undefined,," -i Makefile
-}
-
 post_build() {
 	make man
 }

From 177682dc0e31d411c58e65299c23c5005ca42041 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Sat, 22 Apr 2023 06:16:03 +0000
Subject: [PATCH 097/153] nasm-doc: update to 2.16.01.

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

diff --git a/srcpkgs/nasm-doc/template b/srcpkgs/nasm-doc/template
index dbf825fbbc1b..3bc6cce435fc 100644
--- a/srcpkgs/nasm-doc/template
+++ b/srcpkgs/nasm-doc/template
@@ -1,7 +1,7 @@
 # Template file for 'nasm-doc'
 # Separate to avoid dependency cycles; keep in sync with nasm.
 pkgname=nasm-doc
-version=2.15.05
+version=2.16.01
 revision=1
 build_style=gnu-configure
 make_build_args="doc"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz"
-checksum=3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f
+checksum=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
 
 pre_configure() {
 	vsed -i doc/psfonts.ph -e "s;SourceSansPro;SourceSans3;g"

From b527aeb38bd83bc0e40e71079eeeef9971113f01 Mon Sep 17 00:00:00 2001
From: eljamm <Fedi.Jamoussi@protonmail.ch>
Date: Sat, 15 Apr 2023 13:49:40 +0100
Subject: [PATCH 098/153] onedrive: update to 2.4.23.

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

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 63e4f43a7fbd..e15249cbd7e3 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
 # Template file for 'onedrive'
 pkgname=onedrive
-version=2.4.13
-revision=5
+version=2.4.23
+revision=1
 build_style=gnu-configure
 configure_args="DC=ldc2"
 hostmakedepends="ldc pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/abraunegg/onedrive"
 changelog="https://raw.githubusercontent.com/abraunegg/onedrive/master/CHANGELOG.md"
 distfiles="https://github.com/abraunegg/onedrive/archive/v${version}.tar.gz"
-checksum=6cb903ec14be249caa13c04a4fbba9a431041c224e7d815798a94f7b93861263
+checksum=fb57b9683302a53958671d1c74eb9b8f89ac229055647adce093e8a49ad846e0
 nocross="uses host flags for cross compilations"
 
 post_install() {

From 4c80df22839ba2cb97d345733f67d49001caa353 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 May 2023 13:12:06 +0200
Subject: [PATCH 099/153] sbcl: update to 2.3.4.

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

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 08391d291a06..f0b3c905a115 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.3.2
+version=2.3.4
 revision=1
 # make sure the sbcl option in maxima is enabled for the same archs
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
@@ -15,7 +15,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=44cc162cfa6332a9a88c7a121d19038828a4ba4f6bffb77ef1c7b17407cb1eaa
+checksum=f11b4764c6eabdb27e5a9c46b217204d11bcda534e73bf97073d57831d209c4e
 nocross=yes
 nopie=yes
 
@@ -23,7 +23,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4cf817f1d889244b5ebd4dbf7208d7f66a38a8300b4eb7e823e3b304cfefde11"
+	checksum+=" 2ea6f7648f05aa1384c83331f1b6d7b018f20fbe621f7d3e57bab7c5c2899508"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From c313c7cad4b888cb9e1f33d68be3d63f08b819d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 May 2023 14:39:36 +0200
Subject: [PATCH 100/153] elektroid: update to 2.5.2.

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

diff --git a/srcpkgs/elektroid/template b/srcpkgs/elektroid/template
index 3990f80df589..ab4fb26e548f 100644
--- a/srcpkgs/elektroid/template
+++ b/srcpkgs/elektroid/template
@@ -1,6 +1,6 @@
 # Template file for 'elektroid'
 pkgname=elektroid
-version=2.5.1
+version=2.5.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel-tools libtool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dagargo/elektroid"
 distfiles="https://github.com/dagargo/elektroid/releases/download/${version}/elektroid-${version}.tar.gz"
-checksum=610a7b9e971fb4ebacc838d51e893190089ba735f2b0b0856e20cede14e1ca02
+checksum=38133161c843b103d61b7e773209bfc1e7535dbc6cea3da7bfd6efe5b72bd56b

From a16e0e3c85b9981c350c865f0e17eceff749a24c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 May 2023 14:40:24 +0200
Subject: [PATCH 101/153] fzf: update to 0.40.0.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 95e5a2762c92..5c52a701a309 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.39.0
+version=0.40.0
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/refs/tags/${version}.tar.gz"
-checksum=ac665ac269eca320ca9268227142f01b10ad5d25364ff274658b5a9f709a7259
+checksum=9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65
 
 post_install() {
 	cd ${wrksrc}

From ca0eff19c9433e30f2cb650883a65de8383d50c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 May 2023 14:41:04 +0200
Subject: [PATCH 102/153] perl-JSON-MaybeXS: update to 1.004005.

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

diff --git a/srcpkgs/perl-JSON-MaybeXS/template b/srcpkgs/perl-JSON-MaybeXS/template
index d612727961d9..7cb2de4b0b9b 100644
--- a/srcpkgs/perl-JSON-MaybeXS/template
+++ b/srcpkgs/perl-JSON-MaybeXS/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-JSON-MaybeXS'
 pkgname=perl-JSON-MaybeXS
-version=1.004004
+version=1.004005
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/JSON-MaybeXS"
 distfiles="${CPAN_SITE}/JSON/JSON-MaybeXS-${version}.tar.gz"
-checksum=7ca5921306a544f621705dce987fe955b1a6833d0b195c094626a19dca094dba
+checksum=f5b6bc19f579e66b7299f8748b8ac3e171936dc4e7fcb72a8a257a9bd482a331

From a54303b14876b8e986f15c05ec41753733c976cc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 May 2023 14:43:25 +0200
Subject: [PATCH 103/153] perl-Module-Build: update to 0.4234.

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

diff --git a/srcpkgs/perl-Module-Build/template b/srcpkgs/perl-Module-Build/template
index 6c05669dda05..444e70d9f5b8 100644
--- a/srcpkgs/perl-Module-Build/template
+++ b/srcpkgs/perl-Module-Build/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Module-Build'
 pkgname=perl-Module-Build
-version=0.4232
+version=0.4234
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Module-Build"
 distfiles="${CPAN_SITE}/Module/${pkgname/perl-/}-${version}.tar.gz"
-checksum=67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b
+checksum=66aeac6127418be5e471ead3744648c766bd01482825c5b66652675f2bc86a8f
 
 pre_configure() {
 	unset XBPS_CROSS_BASE

From 44457d98b00854ee8ab6490ba1180d117a544bee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 May 2023 14:44:53 +0200
Subject: [PATCH 104/153] perl-Module-Build-Tiny: update to 0.045.

---
 srcpkgs/perl-Module-Build-Tiny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Module-Build-Tiny/template b/srcpkgs/perl-Module-Build-Tiny/template
index f3a4140cd68e..2a3c60d55d25 100644
--- a/srcpkgs/perl-Module-Build-Tiny/template
+++ b/srcpkgs/perl-Module-Build-Tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Module-Build-Tiny'
 pkgname=perl-Module-Build-Tiny
-version=0.043
+version=0.045
 revision=1
 build_style=perl-ModuleBuild
 hostmakedepends="perl perl-ExtUtils-Config perl-ExtUtils-Helpers perl-ExtUtils-InstallPaths"
@@ -11,4 +11,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Module-Build-Tiny"
 distfiles="${CPAN_SITE}/Module/${pkgname/perl-/}-${version}.tar.gz"
-checksum=68f4e4620e8a75124ce2dadee48d2ba5160b9167012924588d6fb242ff2d7206
+checksum=d20692eee246d0b329b7f7659f36286b14ae0696fe91078a64b7078f8876d300

From 21c73ea90781e47ce5ff5b80890fab7b6b9f24b0 Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Wed, 15 Mar 2023 10:05:17 -0300
Subject: [PATCH 105/153] linux-firmware: update to 20220404

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

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 0abd6d270184..411477bbf308 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,14 +1,14 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20230210
-revision=2
+version=20230404
+revision=1
 depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="custom:see /usr/share/licenses/linux-firmware"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"
-checksum=ccc2ff9d475f368fa915e509fddb2c3815189f9461a008db1af0f096a2bfdbd3
+checksum=09343acd48cb1e33dd6e1f4c2736ceadaa943c42eb20d04a26a5701d05ddde0d
 python_version=3
 nostrip=yes
 

From 5b9f4f322955c29dec3b28a1efcadcdf8268f91e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 9 Mar 2023 08:30:08 -0500
Subject: [PATCH 106/153] python3-inflate64: update to 0.3.1.

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

diff --git a/srcpkgs/python3-inflate64/template b/srcpkgs/python3-inflate64/template
index f413b383c892..e10d05502cf7 100644
--- a/srcpkgs/python3-inflate64/template
+++ b/srcpkgs/python3-inflate64/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-inflate64'
 pkgname=python3-inflate64
-version=0.3.0
-revision=3
+version=0.3.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://codeberg.org/miurahr/inflate64"
 changelog="https://codeberg.org/miurahr/inflate64/raw/branch/main/docs/Changelog.rst"
 distfiles="${PYPI_SITE}/i/inflate64/inflate64-${version}.tar.gz"
-checksum=81fb8e690fbcb92e7d3e6769ec4c6fbfabb88aade677f61b2f4c99874538bf64
+checksum=b52dd8fefd2ba179e5dfa18d6eca7e2fc822584616271c039d5ef1f9ca90c71c

From d59ced59c49bd353c65d24688b380aee94cf79d7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 9 Mar 2023 08:30:18 -0500
Subject: [PATCH 107/153] python3-pyzstd: update to 0.15.7.

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

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
index b95661374b0a..a1250dd9f13d 100644
--- a/srcpkgs/python3-pyzstd/template
+++ b/srcpkgs/python3-pyzstd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyzstd'
 pkgname=python3-pyzstd
-version=0.15.3
-revision=2
+version=0.15.7
+revision=1
 build_style=python3-module
 make_build_args="--dynamic-link-zstd"
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/animalize/pyzstd"
 changelog="https://raw.githubusercontent.com/animalize/pyzstd/dev/README.rst"
 distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
-checksum=ac4edab5d3955343e8f7f287e62cd2882907d46bcba4b406a1e9f84aa2887472
+checksum=55e503f28f5a9d225ce9d0639e3f5b1801bacace5aea926ec2998e73c5150fe7
 
 post_install() {
 	vlicense LICENSE

From 71261d53dfdfff65cf005ba2f276b55f90779ae9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 9 Mar 2023 08:30:16 -0500
Subject: [PATCH 108/153] python3-py7zr: update to 0.20.5.

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

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 13bd87655800..4af84916f64e 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.20.0
-revision=2
+version=0.20.5
+revision=1
 build_style=python3-pep517
 # - test_concurrent.py fails on timeout. This test downloads several different
 # 7z archives; likely failing due to slow download or dead links -
@@ -19,6 +19,6 @@ short_desc="7zip in python3 with various compressions, and AES encryption"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
-changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
+changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/docs/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=2270f922f8d07bb8a83d28e1c57dd77570aea6bb876ed8eb4879a038c149ce5e
+checksum=6fb4889c0fa32581818a3366984083253585d6c794e82c3242b8a12d6aeaabd3

From f763a1208fd674e124463ae2bb987a5a4ba53378 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 May 2023 18:36:43 +0200
Subject: [PATCH 109/153] backblaze-b2: update to 3.9.0.

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

diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index 134fa0c2ff92..1d3893455984 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,6 +1,6 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-pip"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/Backblaze/B2_Command_Line_Tool"
 distfiles="${PYPI_SITE}/b/b2/b2-${version}.tar.gz"
-checksum=c590f89438307b80d136f15889b34b03b09eaa65be0e1b1846492286ed57de45
+checksum=67d2d06a95a5d336e5700c8c39f2a19f9fced47ebeb668223d07c0076e358ea5
 replaces="python-b2>=0"
 make_check=no # tests require unpackaged dependencies
 

From e0f2224cd07e42c05c23fecf3efebfa93017fbd7 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 May 2023 18:37:31 +0200
Subject: [PATCH 110/153] terragrunt: update to 0.45.8.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 006c9c582887..14f61880457b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.45.5
+version=0.45.8
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=f72ea470f8f81439fee6027ecb258b8bcf1670ae4f6284d067a1828c4f773469
+checksum=33780e41a0649f2ec3504cb6e365f191334feb5b90f55ce04193bcd18b570ffe
 
 post_install() {
 	vlicense LICENSE.txt

From 33f6c36440be2c4cdb01444ff71f497788743f46 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 May 2023 18:47:10 +0200
Subject: [PATCH 111/153] libxml2: revlib bump

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

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index b29b99c10b36..d81e9a2c85f8 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2'
 pkgname=libxml2
 version=2.9.13
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu"
 hostmakedepends="gettext pkg-config python3"

From 85288b52dd34988a12b866858b294a55d1a62a2e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 May 2023 18:47:21 +0200
Subject: [PATCH 112/153] texmaker: update to 5.1.4.

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

diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template
index d7a71964ac45..a13824d32dfe 100644
--- a/srcpkgs/texmaker/template
+++ b/srcpkgs/texmaker/template
@@ -1,6 +1,6 @@
 # Template file for 'texmaker'
 pkgname=texmaker
-version=5.1.3
+version=5.1.4
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://www.xm1math.net/texmaker/index.html"
 distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
-checksum=bfa52e5e0e3c61d5258ea8c69ea527f6bd20f0e23fe2da43b80aee00b2609f61
+checksum=320504d62b71b591c06b7d0b1202ac750a3112fe2ca328e30580055eb308fea6

From f57d39c1f4ba5e7157e7f7a729b19fe3947892dc Mon Sep 17 00:00:00 2001
From: Massimo Manzato <massimo.manzato@gmail.com>
Date: Wed, 3 May 2023 19:04:16 +0200
Subject: [PATCH 113/153] libtickit: update to 0.4.3

Closes #43532.
---
 srcpkgs/libtickit/template | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libtickit/template b/srcpkgs/libtickit/template
index 6b2d82cfd0ae..334be73ca277 100644
--- a/srcpkgs/libtickit/template
+++ b/srcpkgs/libtickit/template
@@ -1,20 +1,27 @@
 # Template file for 'libtickit'
 pkgname=libtickit
-version=0.4.1
+version=0.4.3
 revision=1
 build_style=gnu-makefile
-make_build_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
-make_install_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
 make_check_target=test
-hostmakedepends="pkg-config"
+hostmakedepends="libtool perl pkg-config"
 makedepends="libtermkey-devel libtool unibilium-devel"
 checkdepends="perl"
 short_desc="Library for building interactive full-screen terminal programs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://www.leonerd.org.uk/code/libtickit/"
-distfiles="http://www.leonerd.org.uk/code/libtickit/libtickit-${version}.tar.gz"
-checksum=48b72a12548da23f32384ddf0f8d727bc27515f36a74d2f4d4f0bbbb562a2665
+homepage="https://www.leonerd.org.uk/code/libtickit/"
+distfiles="https://www.leonerd.org.uk/code/libtickit/libtickit-${version}.tar.gz"
+checksum=a830588fa1f4c99d548c11e6df50281c23dfa01f75e2ab95151f02715db6bd63
+
+post_extract() {
+	if [ "$CROSS_BUILD" ]; then
+		cp /usr/bin/libtool .
+		sed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool
+		sed -e "s,libtool,./libtool,g" -i Makefile
+	fi
+}
+
 
 post_install() {
 	vlicense LICENSE

From 54ad93f3314d21498be12f249b91457e33cb1bcc Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Sun, 9 Apr 2023 17:10:03 -0300
Subject: [PATCH 114/153] tofi: update to 0.9.1

---
 srcpkgs/tofi/patches/fix-32bit-tests.patch | 84 ++++++++++++++++++++++
 srcpkgs/tofi/template                      |  4 +-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tofi/patches/fix-32bit-tests.patch

diff --git a/srcpkgs/tofi/patches/fix-32bit-tests.patch b/srcpkgs/tofi/patches/fix-32bit-tests.patch
new file mode 100644
index 000000000000..3a853408335b
--- /dev/null
+++ b/srcpkgs/tofi/patches/fix-32bit-tests.patch
@@ -0,0 +1,84 @@
+From 667075f0920da3c2b353fbce54b6430c195ef031 Mon Sep 17 00:00:00 2001
+From: Phil Jones <philj56@gmail.com>
+Date: Sun, 30 Apr 2023 20:08:57 +0100
+Subject: [PATCH] Replace `strto[u]l` with `strto[u]ll`.
+
+On 32-bit systems, using `strtoul` was causing negative values for
+unsigned options to be treated as valid, as the value was being parsed
+as a 32-bit unsigned int, then cast to a 64-bit signed int, which
+remained positive.
+---
+ src/color.c  | 8 ++++----
+ src/config.c | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/color.c b/src/color.c
+index 4b6b356..b1d5e90 100644
+--- a/src/color.c
++++ b/src/color.c
+@@ -22,7 +22,7 @@ struct color hex_to_color(const char *hex)
+ 			hex[2], hex[2],
+ 			'\0'};
+ 		char *endptr;
+-		tmp = strtol(str, &endptr, 16);
++		tmp = strtoll(str, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+@@ -37,14 +37,14 @@ struct color hex_to_color(const char *hex)
+ 			hex[3], hex[3],
+ 			'\0'};
+ 		char *endptr;
+-		tmp = strtol(str, &endptr, 16);
++		tmp = strtoll(str, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+ 		val = tmp;
+ 	} else if (len == 6) {
+ 		char *endptr;
+-		tmp = strtol(hex, &endptr, 16);
++		tmp = strtoll(hex, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+@@ -53,7 +53,7 @@ struct color hex_to_color(const char *hex)
+ 		val |= 0xFFu;
+ 	} else if (len == 8) {
+ 		char *endptr;
+-		tmp = strtol(hex, &endptr, 16);
++		tmp = strtoll(hex, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+diff --git a/src/config.c b/src/config.c
+index 2b85028..556199d 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -1027,7 +1027,7 @@ uint32_t parse_uint32(const char *filename, size_t lineno, const char *str, bool
+ {
+ 	errno = 0;
+ 	char *endptr;
+-	int64_t ret = strtoul(str, &endptr, 0);
++	int64_t ret = strtoull(str, &endptr, 0);
+ 	if (endptr == str || *endptr != '\0') {
+ 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as unsigned int.\n", str);
+ 		if (err) {
+@@ -1046,7 +1046,7 @@ int32_t parse_int32(const char *filename, size_t lineno, const char *str, bool *
+ {
+ 	errno = 0;
+ 	char *endptr;
+-	int64_t ret = strtol(str, &endptr, 0);
++	int64_t ret = strtoll(str, &endptr, 0);
+ 	if (endptr == str || *endptr != '\0') {
+ 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as int.\n", str);
+ 		if (err) {
+@@ -1065,7 +1065,7 @@ struct uint32_percent parse_uint32_percent(const char *filename, size_t lineno,
+ {
+ 	errno = 0;
+ 	char *endptr;
+-	int64_t val = strtoul(str, &endptr, 0);
++	int64_t val = strtoull(str, &endptr, 0);
+ 	bool percent = false;
+ 	if (endptr == str || (*endptr != '\0' && *endptr != '%')) {
+ 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as unsigned int.\n", str);
diff --git a/srcpkgs/tofi/template b/srcpkgs/tofi/template
index 813356a0b1db..1704b4db3822 100644
--- a/srcpkgs/tofi/template
+++ b/srcpkgs/tofi/template
@@ -1,6 +1,6 @@
 # Template file for 'tofi'
 pkgname=tofi
-version=0.8.1
+version=0.9.1
 revision=1
 build_style=meson
 hostmakedepends="scdoc pkg-config wayland-devel wayland-protocols"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/philj56/tofi"
 changelog="https://raw.githubusercontent.com/philj56/tofi/master/CHANGELOG.md"
 distfiles="https://github.com/philj56/tofi/archive/refs/tags/v${version}.tar.gz"
-checksum=0a700f8b0291ef08b3544cd589157393101d52bbd1e7e6aeee8484f9d520a338
+checksum=dd55347b509af786f133def64f3a86f1db258b5e196de80e53d62827bdcc37bc
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel"

From d48443c1b9bb38bb046a29f1cbed067c0d19eba3 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 4 May 2023 02:21:39 +0530
Subject: [PATCH 115/153] python3-yapf: fix egg-info permission

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

diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template
index 1e8bedc6528b..7dbea9f8cf77 100644
--- a/srcpkgs/python3-yapf/template
+++ b/srcpkgs/python3-yapf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yapf'
 pkgname=python3-yapf
 version=0.33.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-tomli"
@@ -12,3 +12,7 @@ homepage="https://github.com/google/yapf"
 changelog="https://raw.githubusercontent.com/google/yapf/main/CHANGELOG"
 distfiles="${PYPI_SITE}/y/yapf/yapf-${version}.tar.gz"
 checksum=da62bdfea3df3673553351e6246abed26d9fe6780e548a5af9e70f6d2b4f5b9a
+
+post_install() {
+	chmod -R a+r "${DESTDIR}/${py3_sitelib}/yapf-${version}-py${py3_ver}.egg-info/"
+}

From 5a93675fd657cd711344e112c73c5cf0cf59767c Mon Sep 17 00:00:00 2001
From: savoy <git@liberation.red>
Date: Mon, 31 Oct 2022 09:31:01 -0500
Subject: [PATCH 116/153] wee-slack: update to 2.9.1

Signed-off-by: savoy <git@liberation.red>
---
 srcpkgs/wee-slack/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wee-slack/template b/srcpkgs/wee-slack/template
index 9cbdb09863e2..6d968556aba0 100644
--- a/srcpkgs/wee-slack/template
+++ b/srcpkgs/wee-slack/template
@@ -1,14 +1,15 @@
 # Template file for 'wee-slack'
 pkgname=wee-slack
-version=2.9.0
+version=2.9.1
 revision=1
 depends="weechat weechat-python python3-websocket-client"
 short_desc="WeeChat plugin for Slack.com"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/wee-slack/wee-slack"
+changelog="https://raw.githubusercontent.com/wee-slack/wee-slack/master/CHANGELOG.md"
 distfiles="https://github.com/wee-slack/wee-slack/archive/v${version}.tar.gz"
-checksum=4b9983e5982450791fbde5335f73c004e170612d8ce78a9520d335acfe022cf9
+checksum=83ca1ddb49fc6b43d7f0bdea8f6127b73adb943cbaf9954746efbb01928c3a0b
 
 do_install() {
 	vinstall wee_slack.py 644 usr/lib/weechat/python/

From c2700753052c031ed1a9f5e709b0c4a0745b0498 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 4 May 2023 01:35:02 +0200
Subject: [PATCH 117/153] obs: update to 29.1.0.

---
 srcpkgs/obs/patches/0001-disable-Werror.patch | 24 +++++++++++++++++++
 srcpkgs/obs/template                          |  7 +++---
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/obs/patches/0001-disable-Werror.patch

diff --git a/srcpkgs/obs/patches/0001-disable-Werror.patch b/srcpkgs/obs/patches/0001-disable-Werror.patch
new file mode 100644
index 000000000000..4afb3627d54c
--- /dev/null
+++ b/srcpkgs/obs/patches/0001-disable-Werror.patch
@@ -0,0 +1,24 @@
+From ff48fe5c97b2d36cecf7492c4c04b79cae8099d2 Mon Sep 17 00:00:00 2001
+From: lemmi <lemmi@nerd2nerd.org>
+Date: Thu, 4 May 2023 09:27:39 +0200
+Subject: [PATCH] disable -Werror
+
+---
+ cmake/Modules/CompilerConfig.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
+index 41c56da8b..b8f8bf330 100644
+--- a/cmake/Modules/CompilerConfig.cmake
++++ b/cmake/Modules/CompilerConfig.cmake
+@@ -101,7 +101,6 @@ else()
+ 
+   option(CALM_DEPRECATION "Keep deprecated-declarations as warnings" OFF)
+   add_compile_options(
+-    -Werror
+     -Wextra
+     -Wvla
+     -Wswitch
+-- 
+2.40.1
+
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 1a7132ae832f..89fd11297c3f 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,11 +1,11 @@
 # Template file for 'obs'
 pkgname=obs
-version=29.0.2
+version=29.1.0
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 build_style=cmake
 configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
- -DENABLE_VST=OFF -DENABLE_AJA=OFF"
+ -DENABLE_VST=OFF -DENABLE_AJA=OFF -DCALM_DEPRECATION=ON"
 hostmakedepends="pkg-config swig python3-devel qt6-base"
 makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
  jack-devel libXcomposite-devel libcurl-devel libva-devel
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://obsproject.com"
 changelog="https://github.com/obsproject/obs-studio/releases"
 distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=0e6260800b80c3fc9f67c4c3fb12ffae740ab1dd188e526a55e0fc8949168db2
+checksum=f6cf84a196636c949add633f37702e3b1c93d7229bda075dd3c3793205f428eb
 
 pre_configure() {
 	# it's not enough to use -DENABLE_BROWSER ...
@@ -35,7 +35,6 @@ obs-devel_package() {
 		vmove usr/lib/libobs-frontend-api.so
 		vmove usr/lib/libobs-opengl.so
 		vmove usr/lib/libobs.so
-		vmove usr/lib/libobsglad.so
 		vmove usr/lib/libobs-scripting.so
 		vmove usr/include
 		vmove usr/lib/cmake

From 4192d0091f1a1684115bad1ec3201e41ddae4778 Mon Sep 17 00:00:00 2001
From: Lukas Jordan <lukas.jordan@pm.me>
Date: Sun, 2 Apr 2023 11:33:40 +0200
Subject: [PATCH 118/153] ncspot: update to 0.13.1.

---
 srcpkgs/ncspot/template | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ncspot/template b/srcpkgs/ncspot/template
index 2144ec2f6d24..98b3d847ed12 100644
--- a/srcpkgs/ncspot/template
+++ b/srcpkgs/ncspot/template
@@ -1,8 +1,9 @@
 # Template file for 'ncspot'
 pkgname=ncspot
-version=0.11.2
-revision=2
+version=0.13.1
+revision=1
 build_style=cargo
+build_helper="qemu"
 configure_args="--features alsa_backend,cover"
 hostmakedepends="pkg-config python3"
 makedepends="openssl-devel dbus-devel pulseaudio-devel alsa-lib-devel"
@@ -11,11 +12,23 @@ short_desc="Cross-platform ncurses Spotify client"
 maintainer="Omar Zeghouani <omarzeghouanii@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/hrkfdn/ncspot"
-distfiles="https://github.com/hrkfdn/ncspot/archive/v${version}.tar.gz"
-checksum=0fd9696e13912b906605e9972bf3b2a8a68688cce17478353713550801c94fab
+changelog="https://github.com/hrkfdn/ncspot/releases"
+distfiles="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${version}.tar.gz"
+checksum=51394f0a4f75c6d6273f1a98be350dca3f50a8ba21e5b563e85b08b9da04af89
+
+post_build() {
+	cargo auditable build --release --target ${RUST_TARGET} --package xtask
+	vtargetrun target/${RUST_TARGET}/release/xtask generate-shell-completion
+	vtargetrun target/${RUST_TARGET}/release/xtask generate-manpage
+}
 
 post_install() {
 	vlicense LICENSE
 	vinstall misc/ncspot.desktop 644 usr/share/applications
 	vinstall images/logo.svg 644 usr/share/icons/hicolor/scalable/apps ncspot.svg
+
+	vman misc/ncspot.1
+	vcompletion misc/ncspot.bash bash
+	vcompletion misc/_ncspot zsh
+	vcompletion misc/ncspot.fish fish
 }

From 7d7d5e6c85ac05fcb2fe86c1b98f5cd1e95ff943 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 5 May 2023 03:03:51 -0400
Subject: [PATCH 119/153] rustypaste: touch for build

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

diff --git a/srcpkgs/rustypaste/template b/srcpkgs/rustypaste/template
index a5de97b5c404..d5cef12dda5d 100644
--- a/srcpkgs/rustypaste/template
+++ b/srcpkgs/rustypaste/template
@@ -1,4 +1,4 @@
-# Template file for 'rustypaste'
+# Template file for 'rustypaste' 
 pkgname=rustypaste
 version=0.8.4
 revision=1

From e299d82ecab543a72ec0991bbbf1c41c688b89e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 5 May 2023 03:04:09 -0400
Subject: [PATCH 120/153] rustypaste-cli: touch for build

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

diff --git a/srcpkgs/rustypaste-cli/template b/srcpkgs/rustypaste-cli/template
index aa3d7fcd26d3..1b1f53295fbd 100644
--- a/srcpkgs/rustypaste-cli/template
+++ b/srcpkgs/rustypaste-cli/template
@@ -1,4 +1,4 @@
-# Template file for 'rustypaste-cli'
+# Template file for 'rustypaste-cli' 
 pkgname=rustypaste-cli
 version=0.3.0
 revision=1

From 2d89091e102972cedc0938f3465ae6ed16cba15b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 May 2023 16:58:22 +0200
Subject: [PATCH 121/153] packer: update to 1.8.7.

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

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 227873af2168..c24377bf3a03 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.8.6
-revision=2
+version=1.8.7
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=11acae341130dff0950a80e4c56df416d547298f42ca49e8e862de23afe1046f
+checksum=0b3a45a3ecb0b5e993a0a39ee4599d69b58c1419cebddbfc45c61eb15389ba98
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 8067efd1889b4aa7b870c9be2f6736e22ec03cdc Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 May 2023 17:00:50 +0200
Subject: [PATCH 122/153] flannel: update to 0.21.5.

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

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 0b2467fddb69..06f9c9f6adb0 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.21.4
-revision=2
+version=0.21.5
+revision=1
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/flannel-io/flannel"
 distfiles="https://github.com/flannel-io/flannel/archive/v${version}.tar.gz"
-checksum=fa926098c29009c3ee2cbe97608e7e9c13c6b82e01f915e851079b31fd8dcbb0
+checksum=51c768f940ae528c61687c8c1574525fe9f0b744f18e5f35dba99ea35895beee
 
 post_install() {
 	vsv flannel

From 545b652e62d47dd14597529120d4954bdba8a5ea Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 5 May 2023 20:46:56 +0200
Subject: [PATCH 123/153] libvirt: update to 9.3.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index c4d376a1c64e..e1cd1aa616f0 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=9.2.0
+version=9.3.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=a07f501e99093ac1374888312be32182e799de17407ed7547d0e469fae8188c5
+checksum=751179b08e5a73b6cfd93200d110df199eaa3973f3554ba2ebcbd71e272bebe1
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From 98c9905356473232f967f8fb09527f9681eee797 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 5 May 2023 20:52:41 +0200
Subject: [PATCH 124/153] libvirt-python3: update to 9.3.0.

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 28856224ba3c..2ec08b26459a 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=9.2.0
+version=9.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=95cc190c57cb84e8ed2e1b8205b01a937e1a4bc19cc8865df19ca4470e6d7c1b
+checksum=9c761d88b4ddcf65b324043944da4f18f82471c74d9371d2372d3b4e0f19861b
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 775c1524e1396133392b7d4e2cf0ffdfc88685d2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 May 2023 21:52:12 +0200
Subject: [PATCH 125/153] xcalc: update to 1.1.2.

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

diff --git a/srcpkgs/xcalc/template b/srcpkgs/xcalc/template
index 90be0b7c5028..e0f937c831c5 100644
--- a/srcpkgs/xcalc/template
+++ b/srcpkgs/xcalc/template
@@ -1,6 +1,6 @@
 # Template file for 'xcalc'
 pkgname=xcalc
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xcalc.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4
+checksum=8578dfa1457e94289f6d6ed6146714307d8a73a1b54d2f42af1321b625fc1cd4
 
 post_install() {
 	vlicense COPYING

From cd782a8a99166c9ce4877bed46a623584a353075 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 May 2023 21:55:40 +0200
Subject: [PATCH 126/153] dune: update to 3.7.1.

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

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index c84daa5ba2b4..8f71b5e689a1 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,6 +1,6 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.6.1
+version=3.7.1
 revision=1
 makedepends="ocaml"
 depends="ocaml"
@@ -8,12 +8,14 @@ short_desc="Composable build system for OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://dune.build/"
+changelog="https://raw.githubusercontent.com/ocaml/dune/main/CHANGES.md"
 distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz"
-checksum=89eb18ff7d3808812e9422b36713336cabc2bd48e875621facee1307ff082f6a
+checksum=9ddc1dae09e7be6d0bf22b7d1584d95a1b3d4f5d1bae1d4095dc4e1833fa86b2
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-build-info dune-configurator
- dune-glob dune-private-libs dune-site dyn stdune ordering xdg fiber"
+ dune-glob dune-private-libs dune-site dyn stdune ordering xdg
+ chrome-trace ocamlc-loc"
 
 do_configure() {
 	./configure --libdir=/usr/lib/ocaml --mandir=/usr/share/man

From 95a7e28a7664a33a7db26dc4d7adec310ad6f010 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 4 May 2023 11:35:22 +0530
Subject: [PATCH 127/153] puzzles: update to 20230505.63346a8.

Add icons, help files
Remove custom update file - dead link, ad-hoc update
---
 srcpkgs/puzzles/template | 8 ++++----
 srcpkgs/puzzles/update   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 srcpkgs/puzzles/update

diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 600b44355dda..260344e0cc6c 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,17 +1,17 @@
 # Template file for 'puzzles'
 pkgname=puzzles
-version=20230404.2499eb4
+version=20230505.63346a8
 revision=1
 build_style=cmake
 configure_args="-DNAME_PREFIX=puzzles-"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config halibut perl ImageMagick"
 makedepends="gtk+3-devel"
 short_desc="Simon Tatham's Portable Puzzle Collection"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=2499eb47fa4e0c86bc1b6100b4922026670b2ad8;sf=tgz>${pkgname}-${version#*.}.tgz"
-checksum=10a5dc2b9e20a45ad683de7536dd33648a4a1ad69da189c90ae5d656cdbd6b8e
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=63346a8ceac9ac1061e59af2a99ab1a44c851392;sf=tgz>${pkgname}-${version#*.}.tgz"
+checksum=77a7a06fa21a987cbc1475bc689b0374633a3fdbe6f76a66832b448697de5d40
 
 post_install() {
 	vlicense LICENCE LICENSE
diff --git a/srcpkgs/puzzles/update b/srcpkgs/puzzles/update
deleted file mode 100644
index fe49dcaad52a..000000000000
--- a/srcpkgs/puzzles/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://svn.tartarus.org/sgt/puzzles/"
-pattern='Revision\s\K\d+(?=.*of)'

From 0c8f1e310de0310e6b8b28d7aaecc24d27856931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 5 May 2023 22:40:07 -0300
Subject: [PATCH 128/153] python3-ipython: update to 8.13.2.

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

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index a09b9559fba1..14b1cc291123 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.13.1
+version=8.13.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
 homepage="https://ipython.org/"
 changelog="https://github.com/ipython/ipython/raw/main/docs/source/whatsnew/version8.rst"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=9c8487ac18f330c8a683fc50ab6d7bc0fcf9ef1d7a9f6ce7926938261067b81f
+checksum=7dff3fad32b97f6488e02f87b970f309d082f758d7b7fc252e3b19ee0e432dbb
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From b0cb72fb9781fd3d817ccacec0812dc9a8c5789b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 6 May 2023 01:41:15 +0300
Subject: [PATCH 129/153] fastd: remove -Db_lto=true.

This is now the default in void-packages for packages with
build_style=meson.
---
 srcpkgs/fastd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fastd/template b/srcpkgs/fastd/template
index d07de67b11dc..d05ca42e9e92 100644
--- a/srcpkgs/fastd/template
+++ b/srcpkgs/fastd/template
@@ -3,7 +3,7 @@ pkgname=fastd
 version=21
 revision=1
 build_style=meson
-configure_args="-Db_lto=true -Dcipher_aes128-ctr=disabled"
+configure_args="-Dcipher_aes128-ctr=disabled"
 hostmakedepends="bison pkg-config"
 makedepends="json-c-devel libcap-devel libuecc-devel libsodium-devel"
 short_desc="Fast and Secure Tunneling Daemon"

From 43334efc726cc9885273f62e87f64e55d796a6e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 3 May 2023 15:08:42 -0400
Subject: [PATCH 130/153] vivaldi: update to 6.0.2979.18, unrestrict, support
 user flags, adopt.

will now read the contents of `$XDG_CONFIG_HOME/vivaldi-stable.conf` and
pass that to the underlying binary

patch comes from arch

for example, to force `prefers-color-scheme: dark` and work on wayland:
```
$ cat ~/.config/vivaldi-stable.conf
--force-dark-mode --ozone-platform-hint=auto
```

missing dependencies libnotify and xdg-utils also added

permission to redistribute has now been granted, see:
srcpkgs/vivaldi/files/redistribution-permission.eml
---
 .../files/redistribution-permission.eml       | 38 +++++++++++++++++++
 .../vivaldi/patches/support-user-flags.patch  | 37 ++++++++++++++++++
 srcpkgs/vivaldi/template                      | 15 ++++----
 3 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/vivaldi/files/redistribution-permission.eml
 create mode 100644 srcpkgs/vivaldi/patches/support-user-flags.patch

diff --git a/srcpkgs/vivaldi/files/redistribution-permission.eml b/srcpkgs/vivaldi/files/redistribution-permission.eml
new file mode 100644
index 000000000000..35f858b13ad8
--- /dev/null
+++ b/srcpkgs/vivaldi/files/redistribution-permission.eml
@@ -0,0 +1,38 @@
+Subject: Re: Linux distro: permission to redistribute?
+From: Tatsuki Tomita <tatsuki at vivaldi dot com>
+Date: Thu, 4 May 2023 22:09:18 -0700
+Cc: =?utf-8?Q?Ruar=C3=AD_=C3=98degaard?= <ruario at vivaldi dot com>
+To: abby at voidlinux dot org
+
+Hello Abby,
+
+Thank you for reaching out and your interest in distributing Vivaldi.
+Yes, please feel free to distribute Vivaldi as an unrestricted package.
+
+We are excited to see that more Void linux user will discover and try Vivaldi.
+
+If you need any other assistance, please let us know.
+
+Kind regards,
+Tatsuki
+
+> On May 3, 2023, at 12:58 PM, abby <abby at voidlinux dot org> wrote:
+> 
+> Hello,
+> 
+> I am a maintainer of Void Linux (https://voidlinux.org).
+> 
+> Currently, we package Vivaldi as a "restricted" package (one the user has to
+> build themselves) because (as we read/understood it) there is no explicit
+> permission to redistribute the files in our repositories and mirrors as a
+> package for Void's package manager.
+> 
+> Recently, I noticed the "Linux Distributions" page on Vivaldi's website
+> (https://vivaldi.com/partners/linux/) and that some other distributions
+> package Vivaldi in their regular repositories (equivalent to an
+> "unrestricted" package on Void).
+> Do we need explicit permission to redistribute Vivaldi in this manner, and if
+> so, can we get that permission?
+> 
+> Thanks,
+> Abby
diff --git a/srcpkgs/vivaldi/patches/support-user-flags.patch b/srcpkgs/vivaldi/patches/support-user-flags.patch
new file mode 100644
index 000000000000..5d3ef3bbe4b0
--- /dev/null
+++ b/srcpkgs/vivaldi/patches/support-user-flags.patch
@@ -0,0 +1,37 @@
+From 68c2dec905a7c88895c458dd40708ab9989385cf Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder@gmail.com>
+Date: Wed, 19 Jan 2022 20:57:58 +0100
+Subject: [PATCH] add support for user flags
+
+Signed-off-by: BlackEagle <ike.devolder@gmail.com>
+---
+ opt/vivaldi/vivaldi | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/opt/vivaldi/vivaldi b/opt/vivaldi/vivaldi
+index 5b5f1bf..8e95859 100755
+--- a/opt/vivaldi/vivaldi
++++ b/opt/vivaldi/vivaldi
+@@ -53,6 +53,13 @@ export CHROME_VERSION_EXTRA="stable"
+ # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
+ export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
+ 
++# Allow users to override command-line options
++XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config}
++VIVALDI_USER_FLAGS=""
++if [[ -f "$XDG_CONFIG_HOME/vivaldi-$CHROME_VERSION_EXTRA.conf" ]]; then
++   VIVALDI_USER_FLAGS="$(cat "$XDG_CONFIG_HOME/vivaldi-$CHROME_VERSION_EXTRA.conf")"
++fi
++
+ # Sanitize std{in,out,err} because they'll be shared with untrusted child
+ # processes (http://crbug.com/376567).
+ exec < /dev/null
+@@ -60,4 +67,4 @@ exec > >(exec cat)
+ exec 2> >(exec cat >&2)
+ 
+ # Note: exec -a below is a bashism.
+-exec -a "$0" "$HERE/vivaldi-bin" "$@"
++exec -a "$0" "$HERE/vivaldi-bin" $VIVALDI_USER_FLAGS "$@"
+-- 
+2.34.1
+
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 7e4d4e8ab554..e07c840b03a0 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,30 +1,31 @@
 # Template file for 'vivaldi'
+# Permission to redistribute is granted.
+# see: srcpkgs/vivaldi/files/redistribution-permission.eml
 pkgname=vivaldi
-version=6.0.2979.15
+version=6.0.2979.18
 revision=1
 _release=1
 archs="x86_64 aarch64 armv7l"
-depends="desktop-file-utils hicolor-icon-theme xz"
+depends="desktop-file-utils hicolor-icon-theme xz libnotify xdg-utils"
 short_desc="Advanced browser made with the power user in mind"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="custom:Proprietary"
 homepage="https://vivaldi.com"
 repository=nonfree
-restricted=yes
 nostrip=yes
 skiprdeps="/opt/vivaldi/libqt5_shim.so"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
-	checksum=bef374031acaa2da61608a64c8e28706010e42d1782ef601575701e7dd4809b7
+	checksum=baa8572fb9277661a838e6a5c90ea6571441de4f0bd75509cc00c29cd6a48fae
 	;;
 aarch64)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
-	checksum=eab113c5e131b47c56aca14ed0c1f38cb82768751e44456ab0e07ddbae2366bf
+	checksum=4b76f49a65ac42158328fcf7e06cdbe74abec00511005344b7a22f0aaa3c08cb
 	;;
 armv7l)
 	distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
-	checksum=da92a980b0b8c7c6f96f5a56204e3bff72d333c17131c6f8f3c990a9ba84c9d3
+	checksum=7ddd07ade52ef79aa41a3467737620b941491482250b03a7f06f11de2c71ec1e
 	;;
 *)
 	broken="No distfiles available for this target"

From 28d11fc3e722f5625e759824a7b7eb34831826c2 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Thu, 2 Mar 2023 02:46:36 +0000
Subject: [PATCH 131/153] dracut: remove ifcfg dracut module

Other changes:
 - remove connman as it depends on systemd
 - move more network dependent modules to dracut-network package
---
 srcpkgs/dracut/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 859d7a2c907f..436a6e29b156 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -52,7 +52,7 @@ post_install() {
 
 	# systemd dependent additional dracut modules
 	for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
-		35network-manager 35network-wicked 80lvmmerge \
+		35connman 35network-manager 35network-wicked 80lvmmerge \
 		99memstrack 99squash; do
 		rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
 	done
@@ -64,6 +64,9 @@ post_install() {
 		rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
 	done
 
+	# ifcfg network-scripts dependent (RHEL-derived)
+	rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
+
 	rm ${DESTDIR}/usr/share/man/man8/*.service.*
 	rm -r ${DESTDIR}/usr/lib/kernel
 }
@@ -72,8 +75,9 @@ dracut-network_package() {
 	depends="dhclient ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - network modules"
 	pkg_install() {
-		for f in 35network-legacy 40network 90livenet \
-			95fcoe 95iscsi 95nbd 95nfs; do
+		for f in 35network-legacy 40network 45url-lib \
+			90kernel-network-modules 90qemu-net 90livenet \
+			95cifs 95fcoe 95fcoe-uefi 95iscsi 95nbd 95nfs 95ssh-client; do
 			vmove usr/lib/dracut/modules.d/${f}
 		done
 	}

From 7433b37ff3bd9b9eebcd8a96e06be64765ce3d06 Mon Sep 17 00:00:00 2001
From: z411 <z411@omaera.org>
Date: Fri, 5 May 2023 03:13:27 -0400
Subject: [PATCH 132/153] mumble: backport fix for segfault with pipewire

---
 srcpkgs/mumble/patches/pipewire-fix.patch | 38 +++++++++++++++++++++++
 srcpkgs/mumble/template                   |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mumble/patches/pipewire-fix.patch

diff --git a/srcpkgs/mumble/patches/pipewire-fix.patch b/srcpkgs/mumble/patches/pipewire-fix.patch
new file mode 100644
index 000000000000..460f00eb195c
--- /dev/null
+++ b/srcpkgs/mumble/patches/pipewire-fix.patch
@@ -0,0 +1,38 @@
+From 24b9276d97cac459284143b936e46b626d7396f0 Mon Sep 17 00:00:00 2001
+From: Robert Adam <dev@robert-adam.de>
+Date: Tue, 11 Apr 2023 13:50:47 +0200
+Subject: [PATCH] FIX(client): PipeWire crash
+
+When destroying the PipeWire object we first destroyed the thread loop
+and then the stream, but this has to be done in reverse order in order
+to avoid crashes.
+
+Fixes #6101
+
+Source: https://github.com/mumble-voip/mumble/pull/6103
+---
+ src/mumble/PipeWire.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/mumble/PipeWire.cpp b/src/mumble/PipeWire.cpp
+index 91924e4fb1..c206ab5bbb 100644
+--- a/src/mumble/PipeWire.cpp
++++ b/src/mumble/PipeWire.cpp
+@@ -213,13 +213,14 @@ PipeWireEngine::~PipeWireEngine() {
+ 		return;
+ 	}
+ 
++	if (m_stream) {
++		pws->pw_stream_destroy(m_stream);
++	}
++
+ 	if (m_thread) {
+ 		pws->pw_thread_loop_destroy(m_thread);
+ 	}
+ 
+-	if (m_stream) {
+-		pws->pw_stream_destroy(m_stream);
+-	}
+ 
+ 	if (m_loop) {
+ 		pws->pw_loop_destroy(m_loop);
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index acb6af454e0f..35c2728c74ce 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.287
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF

From f38108a5a539dc5856f1d9d1b9daa0de76795d4e Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Wed, 19 Apr 2023 00:39:59 -0300
Subject: [PATCH 133/153] common/shlibs: add libplayerctl.so.2

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 8c47e79b8c43..ebd3d4cf13ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4252,3 +4252,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libplayerctl.so.2 playerctl-2.4.1_1

From 07923a5bc0ddafe0d69ef33c3e37712c31cf467b Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Wed, 19 Apr 2023 00:40:31 -0300
Subject: [PATCH 134/153] Waybar: update to 0.9.17.

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

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 3d3a889229f2..76b2f23526f2 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,10 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.16
+version=0.9.17
 revision=1
-_date_version=3.0.1
-_mesonbuild_date_ver=3.0.0-1
-build_wrksrc=Waybar-${version}
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled
@@ -15,8 +12,9 @@ configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
  -Dsndio=$(vopt_if sndio enabled disabled)"
 hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
  $(vopt_if dbusmenugtk gobject-introspection)"
-makedepends="libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
- gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel
+makedepends="libevdev-devel libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
+ gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel chrono-date-devel
+ playerctl-devel wireplumber-devel pipewire-devel
  $(vopt_if libnl libnl3-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
@@ -27,13 +25,8 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
-# date library URLs and checksums taken from subprojects/date.wrap
-distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz
- https://github.com/HowardHinnant/date/archive/refs/tags/v${_date_version}.tar.gz
- https://github.com/mesonbuild/hinnant-date/archive/refs/tags/${_mesonbuild_date_ver}.tar.gz"
-checksum="37ebd7b10e32e802afe9236ea9374fabb77b1abb2c203ca6173b27dc03128096
- 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
- f2aa492b59893f69367228bf802cbb0a07c4d52fac2185dfd8ebb5d16295d893"
+distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz"
+checksum="da6f448be343a593ee092486fb4744502aa1e6ad85f4eccc3670d0b84a2a4266"
 
 build_options="libnl pulseaudio dbusmenugtk mpd sndio"
 build_options_default="libnl pulseaudio dbusmenugtk mpd sndio"
@@ -42,12 +35,6 @@ desc_option_libnl="Enable libnl support for network related features"
 desc_option_dbusmenugtk="Enable support for tray"
 desc_option_mpd="Enable support for MPD"
 
-post_extract() {
-	mv hinnant-date-${_mesonbuild_date_ver}/meson_options.txt date-${_date_version}/
-	mv hinnant-date-${_mesonbuild_date_ver}/meson.build date-${_date_version}/
-	mv date-${_date_version} Waybar-${version}/subprojects/
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 7a6b764ffc7c5c765a30f407b09b076f76238868 Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Tue, 25 Apr 2023 23:47:22 -0300
Subject: [PATCH 135/153] common/shlibs: add libwireplumber-0.4.so.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index ebd3d4cf13ad..89f7e53081f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4253,3 +4253,4 @@ libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
 libplayerctl.so.2 playerctl-2.4.1_1
+libwireplumber-0.4.so.0 wireplumber-0.4.14_1

From 3c0f848af9da760973345e817519b743e45b5869 Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Thu, 4 May 2023 09:24:11 -0300
Subject: [PATCH 136/153] Waybar: update to 0.9.17.

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

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 76b2f23526f2..4a6d1d595037 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -9,12 +9,14 @@ configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
  -Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
  -Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)
  -Dmpd=$(vopt_if mpd enabled disabled)
- -Dsndio=$(vopt_if sndio enabled disabled)"
+ -Dsndio=$(vopt_if sndio enabled disabled)
+ -Dwireplumber=$(vopt_if pipewire enabled disabled)"
 hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
  $(vopt_if dbusmenugtk gobject-introspection)"
 makedepends="libevdev-devel libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
  gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel chrono-date-devel
- playerctl-devel wireplumber-devel pipewire-devel
+ playerctl-devel
+ $(vopt_if pipewire 'wireplumber-devel pipewire-devel')
  $(vopt_if libnl libnl3-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
@@ -28,12 +30,13 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz"
 checksum="da6f448be343a593ee092486fb4744502aa1e6ad85f4eccc3670d0b84a2a4266"
 
-build_options="libnl pulseaudio dbusmenugtk mpd sndio"
-build_options_default="libnl pulseaudio dbusmenugtk mpd sndio"
+build_options="libnl pulseaudio dbusmenugtk mpd sndio pipewire"
+build_options_default="libnl pulseaudio dbusmenugtk mpd sndio pipewire"
 
 desc_option_libnl="Enable libnl support for network related features"
 desc_option_dbusmenugtk="Enable support for tray"
 desc_option_mpd="Enable support for MPD"
+desc_option_pipewire="Enable support for pipewire related features"
 
 post_install() {
 	vlicense LICENSE

From 7b4a6ddb0559991ef2ff758dd5600959639abc93 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 30 Apr 2023 14:12:13 -0400
Subject: [PATCH 137/153] common/environment/setup/install.sh: support encoding
 in vman

`vman out/foo.fr.UTF-8.1` should install `usr/share/man/fr.UTF-8/man1/foo.1`,
not `usr/share/man/fr/man1/foo.UTF-8.1`
---
 common/environment/setup/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index b0c5b22f4c2a..ba0845bba5d1 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -94,9 +94,9 @@ _vman() {
 		suffix=${target##*.}
 	fi
 
-	if  [[ $target =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?)\.(.*) ]]
+	if  [[ $target =~ (.*)\.([a-z][a-z](_[A-Z][A-Z])?(\.[^.]+)?)\.(.*) ]]
 	then
-		name=${BASH_REMATCH[1]}.${BASH_REMATCH[4]}
+		name=${BASH_REMATCH[1]}.${BASH_REMATCH[5]}
 		mandir=${BASH_REMATCH[2]}/man${suffix:0:1}
 	else
 		name=$target

From 3d1ca0ce01185363d9af7abfbf0a747f18c8ea80 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 7 May 2023 00:59:58 +0200
Subject: [PATCH 138/153] whois: update to 5.5.17.

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

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index ca2750ddd0fd..d851746b72e1 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,6 +1,6 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.16
+version=5.5.17
 revision=1
 build_style=gnu-makefile
 make_build_args="HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.linux.it/~md/software"
 changelog="https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=0a818f56c4bb909cf8665766cb683931de52901d6a33627d51b1005add3cdb27
+checksum=effe86e6d75101c2f33a0b3d2d948ab54aa57893fedc3b9983ffd55e881e2521
 
 alternatives="
  whois:whois:/usr/bin/gwhois

From f9a97ef150f29c9aaa8e4ed6753200ee288d41bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 10:34:26 +0200
Subject: [PATCH 139/153] gtk4: update to 4.10.3.

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6976aee84817..a2566d4042d3 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.10.1
-revision=2
+version=4.10.3
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dman-pages=true -Dgtk_doc=true
@@ -33,7 +33,7 @@ homepage="https://www.gtk.org/"
 #changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-10/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e8fcac04bc7715b9da667c911a5ee8f262e200d1d6a50adf23645ca8cfcd0311
+checksum=4545441ad79e377eb6e0a705026dc7a46886e46a1b034db40912909da801cea9
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"

From d4c3018234b17c1dc89ce5a2778656e58ed15e92 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 10:35:45 +0200
Subject: [PATCH 140/153] nautilus: update to 44.1.

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 91329f37d77d..66566e251d59 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=44.0
+version=44.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,9 +18,10 @@ short_desc="GNOME file manager"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
-changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-44/NEWS"
 distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
-checksum=57b99ebb8e2b9c1512d381e53096188c087b33410d6c52d87a27bd60ee76ac7f
+checksum=360802a595e3edbad962c8cea353b62baa8be407513b5162c89c933ca5387aa9
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=ci-skip

From 5583985d27fb9e5ddcecd064584ad4a9a7733ff0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 10:44:08 +0200
Subject: [PATCH 141/153] wike: update to 2.0.1.

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

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
index 731bbc58d675..b1a61bd14a25 100644
--- a/srcpkgs/wike/template
+++ b/srcpkgs/wike/template
@@ -1,6 +1,6 @@
 # Template file for 'wike'
 pkgname=wike
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel gettext"
@@ -10,4 +10,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hugolabe/Wike"
 distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
-checksum=3fbad2f9e197fe3b96012805edfc11a983f8b82f9b5a8614fe10ae72883e255a
+checksum=b9a435ea648c8768b0ffc83222d67815aa3d7ee2677d0d0afae2b99aa15d5f13

From 2bbf0782ea7d38697eb6bd8e5bdc8cde1c9a98ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 10:53:21 +0200
Subject: [PATCH 142/153] pylint: update to 2.17.4.

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

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index b1e2221920db..6032da0fb413 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.17.2
+version=2.17.4
 revision=1
 build_style=python3-pep517
 make_build_args="--skip-dependency-check --no-isolation --wheel"
@@ -15,8 +15,14 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://pylint.pycqa.org"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=4e1052a2cf2d9c3098382e395519abaa3ebec8d5b749cad8d249cccb799adb05
-make_check=no # FIXME
+checksum=a4be4ce65a5ab900fec8a6f38670e84c9720cb1b611991845c2c5ff136afb794
+
+do_check() {
+	# FIXME: run upstream test suite
+	# for now, let's just try to verify that pylint can run and dependencies
+	# are correct
+	PYTHONPATH=. python3 -m pylint --version
+}
 
 post_install() {
 	# install example config and emacs files

From 0d5c8dc28514b0d6f01bac8491c7817371b1178e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 10:57:37 +0200
Subject: [PATCH 143/153] python3-astroid: update to 2.15.4.

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

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 2a3a75090be5..5c0678f2d82a 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,15 +1,17 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.15.2
+version=2.15.4
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+# pip is necessary because IsolatedAstroidManagerTest.test_no_user_warning
+# tries to use the pip module with mgr.ast_from_module_name("pip")
+checkdepends="$depends python3-pytest python3-numpy python3-pip"
 short_desc="Abstract syntax tree for Python3"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
 distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=eb9a4ee7ca74a6f4f2a26e3cb68db2f0dc0a4350555782f3b61cb5bc7c1794e4
+checksum=a2b2d239476464c63fbfbd0dbebe589cf5ecd48820015dbb9f1c1c986fd2d6dc

From 0797a3b46e90941c60b2176ffc40ef3a16d78f0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 11:00:08 +0200
Subject: [PATCH 144/153] python3-tomlkit: update to 0.11.8.

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

diff --git a/srcpkgs/python3-tomlkit/template b/srcpkgs/python3-tomlkit/template
index d56671c334de..ef4fb82799bb 100644
--- a/srcpkgs/python3-tomlkit/template
+++ b/srcpkgs/python3-tomlkit/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-tomlkit'
 pkgname=python3-tomlkit
-version=0.11.6
+version=0.11.8
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
 depends="python3"
 checkdepends="python3-pytest python3-yaml"
 short_desc="Style preserving TOML library"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/sdispater/tomlkit"
 changelog="https://raw.githubusercontent.com/sdispater/tomlkit/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/t/tomlkit/tomlkit-${version}.tar.gz"
-checksum=71b952e5721688937fb02cf9d354dbcf0785066149d2855e44531ebdd2b65d73
+checksum=9330fc7faa1db67b541b28e62018c17d20be733177d290a13b24c62d1614e0c3
 
 post_install() {
 	vlicense LICENSE

From f5711b70978558774d1b303e1dba9b4ddaf7a65d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 11:05:49 +0200
Subject: [PATCH 145/153] python-service_identity: add missing dependency

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

diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
index 9f2df81580f4..4e574ed3443a 100644
--- a/srcpkgs/python-service_identity/template
+++ b/srcpkgs/python-service_identity/template
@@ -1,7 +1,7 @@
 # Template file for 'python-service_identity'
 pkgname=python-service_identity
 version=18.1.0
-revision=6
+revision=7
 build_style=python-module
 pycompile_module="service_identity"
 hostmakedepends="python-setuptools python3-setuptools"
@@ -10,6 +10,7 @@ short_desc="Service identity verification for Python (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://service-identity.readthedocs.org/"
+changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
 checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
 
@@ -18,7 +19,7 @@ post_install() {
 }
 
 python3-service_identity_package() {
-	depends="python3-attrs python3-pyasn1-modules python3-cryptography"
+	depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six"
 	pycompile_module="service_identity"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {

From b8fa709a3e4496f4221844bda8a314017fceedcb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:14:46 +0200
Subject: [PATCH 146/153] nncp: update to 8.8.3.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 0ed5868b0021..5d2712cd6717 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.8.2
-revision=2
+version=8.8.3
+revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"
@@ -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=02b98dc4654c46328a043209cd2da28bf33a53baf15574429c6c0747ae2fcf39
+checksum=225750084747e970d82be0d6e6507fe47145146baad670e40b011a568eef22f1
 
 do_build() {
 	make

From 3545c4084425f22464468a29e6b6ce6561797f68 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:15:38 +0200
Subject: [PATCH 147/153] rex: update to 1.14.2.

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

diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template
index dac1fbc41885..973c62c0500c 100644
--- a/srcpkgs/rex/template
+++ b/srcpkgs/rex/template
@@ -1,6 +1,6 @@
 # Template file for 'rex'
 pkgname=rex
-version=1.14.1
+version=1.14.2
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-AWS-Signature4 perl-Clone-Choose
@@ -21,7 +21,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://www.rexify.org/"
 distfiles="https://cpan.metacpan.org/authors/id/F/FE/FERKI/Rex-${version}.tar.gz"
-checksum=8822207ab74f2a6218f8eded7c295259e350698c3ff987582ca1a6acae46ffac
+checksum=21daa951da747f0053afd7ad946fce2feb2c08ddb1cc2bfe00ee46601a8cab56
 
 post_install() {
 	vinstall share/rex-tab-completion.bash 644 usr/share/bash-completion/completions rex

From 5e4d33048a30d0f26c8c285fc61012c8511e88eb Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Mon, 24 Apr 2023 15:50:30 +0530
Subject: [PATCH 148/153] telegram-desktop: update to 4.8.0.

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index aae9f3135100..33493e035390 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=4.6.5
+version=4.8.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=3448d879afdc7c5c06d2b0f9cabe339b08093cb25f380a3e398d32daa96a9c36
+checksum=99d50c75171c8c6e74b2b9298db48deff32a60ced35195f9279469914b8ee1f9
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 495db89f66ce823930983e3666d8f69a7ea742d2 Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Mon, 3 Apr 2023 12:12:51 +0530
Subject: [PATCH 149/153] glibmm2.68: update to 2.76.0.

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 srcpkgs/glibmm2.68/template | 6 ++++--
 srcpkgs/glibmm2.68/update   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glibmm2.68/template b/srcpkgs/glibmm2.68/template
index f6588d954663..d43e796e9954 100644
--- a/srcpkgs/glibmm2.68/template
+++ b/srcpkgs/glibmm2.68/template
@@ -1,8 +1,9 @@
 # Template file for 'glibmm2.68'
 pkgname=glibmm2.68
-version=2.68.1
+version=2.76.0
 revision=1
 build_style=meson
+configure_args="-Dbuild-examples=false"
 hostmakedepends="glib-devel perl pkg-config"
 makedepends="libglib-devel libsigc++3-devel"
 checkdepends="glib-networking"
@@ -10,8 +11,9 @@ short_desc="C++ bindings for GLib"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
+changelog="https://gitlab.gnome.org/GNOME/glibmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz"
-checksum=6664e27c9a9cca81c29e35687f49f2e0d173a2fc9e98c3428311f707db532f8c
+checksum=8637d80ceabd94fddd6e48970a082a264558d4ab82684e15ffc87e7ef3462ab2
 
 glibmm2.68-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/glibmm2.68/update b/srcpkgs/glibmm2.68/update
index c2768fb0e70f..8173c5f3bac9 100644
--- a/srcpkgs/glibmm2.68/update
+++ b/srcpkgs/glibmm2.68/update
@@ -1,3 +1,3 @@
 pkgname=glibmm
 site=https://gitlab.gnome.org/GNOME/glibmm/-/tags
-pattern="$pkgname-\K[0-9]\.[0-9]*[02468]\.[0-9.]*[0-9](?=)"
+ignore="*.*[13579].*"

From 5035a93241856de7fb3bf8617ba8f227039070e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 May 2023 15:05:50 +0200
Subject: [PATCH 150/153] telegram-desktop: update to 4.8.1.

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

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 33493e035390..60df3278b05e 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=4.8.0
+version=4.8.1
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=99d50c75171c8c6e74b2b9298db48deff32a60ced35195f9279469914b8ee1f9
+checksum=96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From c7206b4bdc5db53d593724e365aec78f9cec447b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 11:23:17 +0200
Subject: [PATCH 151/153] common/build-style/python3-pep517: use absolute path
 for check temp dir

some tests change cwd which causes relative tmpdir to point to a non-existent
location
---
 common/build-style/python3-pep517.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index f34b05c2a550..f13046ea1968 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -20,7 +20,7 @@ do_check() {
 			make_install_target="dist/${wheelbase//-/_}-${version}-*-*-*.whl"
 		fi
 
-		local testdir="tmp/$(date +%s)"
+		local testdir="${wrksrc}/tmp/$(date +%s)"
 		python3 -m installer --destdir "${testdir}" \
 			${make_install_args} ${make_install_target}
 

From 01004301617104acfad10f23dbc13eddbd91e127 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 7 May 2023 11:24:24 +0200
Subject: [PATCH 152/153] python3-trustme: update to 1.0.0.

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

diff --git a/srcpkgs/python3-trustme/template b/srcpkgs/python3-trustme/template
index 99143bce7075..f0c672da5b2c 100644
--- a/srcpkgs/python3-trustme/template
+++ b/srcpkgs/python3-trustme/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-trustme'
 pkgname=python3-trustme
-version=0.9.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=1.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-cryptography python3-idna"
 checkdepends="python3-pytest python3-service_identity python3-openssl $depends"
 short_desc="Fake CA for testing"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://trustme.rtfd.io/"
+changelog="https://github.com/python-trio/trustme/blob/master/docs/source/index.rst#change-history"
 distfiles="https://github.com/python-trio/trustme/archive/refs/tags/v$version.tar.gz"
-checksum=e9f2544bcc39583a62b5d39d9f0ce3da8528ee448911035a679f7ddb1edeab5e
+checksum=2cdfdd50081cb959a20d4878b631e7174593e926b9f8b87f2d5cabc3ca21c1ab

From 3dd81b1ab7967f43adb856785df344f3ab4fdc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Friedel=20Sch=C3=B6n?= <derfriedmundschoen@gmail.com>
Date: Mon, 8 May 2023 01:13:18 +0200
Subject: [PATCH 153/153] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
index e237ff5e4ee3..71f76325ef5e 100644
--- a/srcpkgs/fiss/template
+++ b/srcpkgs/fiss/template
@@ -7,12 +7,10 @@ maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
 license="Zlib"
 homepage="https://github.com/friedelschoen/fiss"
 distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
-checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+checksum=6a745d950f726b4cb9b36b82951bed3818b4f23836d5782c5df1c4f70cf9c4f6
 
 do_build() {
 	make all
-
-	rm -r etc/service.d/agetty-*
 }
 
 do_install() {

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

* Re: [PR PATCH] [Closed]: New package: fiss-0.1.1
  2023-04-30  0:08 [PR PATCH] New package: fiss-0.1.1 friedelschoen
  2023-05-07 23:13 ` [PR PATCH] [Updated] " friedelschoen
@ 2023-05-07 23:16 ` friedelschoen
  1 sibling, 0 replies; 6+ messages in thread
From: friedelschoen @ 2023-05-07 23:16 UTC (permalink / raw)
  To: ml

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

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

New package: fiss-0.1.1
https://github.com/void-linux/void-packages/pull/43676

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

* Re: [PR PATCH] [Updated] New package: fiss-0.1.1
  2023-05-07 23:22 [PR PATCH] " friedelschoen
  2023-05-08 20:50 ` [PR PATCH] [Updated] " friedelschoen
  2023-05-08 20:52 ` friedelschoen
@ 2023-05-08 21:30 ` friedelschoen
  2 siblings, 0 replies; 6+ messages in thread
From: friedelschoen @ 2023-05-08 21:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/friedelschoen/void-packages master
https://github.com/void-linux/void-packages/pull/43798

New package: fiss-0.1.1
The old request did not cross-compile and conflicts with `runit`/`runit-void`
- above packages are added to `removes`
- cross-compiling still failed by stripping the binaries

Anyways:
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - only x86_64-* works, as cross-compile-strip will fail (unrecognized file-format)

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

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

From 043af249e45f0237966766ed6495c9251048adc2 Mon Sep 17 00:00:00 2001
From: Friedel Schon <derfriedmundschoen@gmail.com>
Date: Sun, 30 Apr 2023 02:03:46 +0200
Subject: [PATCH 1/2] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
new file mode 100644
index 000000000000..e237ff5e4ee3
--- /dev/null
+++ b/srcpkgs/fiss/template
@@ -0,0 +1,28 @@
+# Template file for 'fiss'
+pkgname=fiss
+version=0.1.1
+revision=1
+short_desc="Friedel's Initialization and Service Supervision"
+maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
+license="Zlib"
+homepage="https://github.com/friedelschoen/fiss"
+distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
+checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+
+do_build() {
+	make all
+
+	rm -r etc/service.d/agetty-*
+}
+
+do_install() {
+	vlicense LICENSE
+
+	vcopy usr /
+	vcopy etc /
+	vcopy bin /usr
+
+	for f in man/*; do
+		vman $f
+	done
+}

From f2ddbd02c392a5f623ee4d313bae27aa2fb3d03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Friedel=20Sch=C3=B6n?= <derfriedmundschoen@gmail.com>
Date: Mon, 8 May 2023 01:13:18 +0200
Subject: [PATCH 2/2] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
index e237ff5e4ee3..9aad7c9d1f83 100644
--- a/srcpkgs/fiss/template
+++ b/srcpkgs/fiss/template
@@ -7,18 +7,17 @@ maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
 license="Zlib"
 homepage="https://github.com/friedelschoen/fiss"
 distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
-checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+checksum=3755f199d09d63b8f984d58d99cbc0c89c52a9037840c3cbd59c7f78fe3cfce2
+conflicts="runit runit-void"
 
 do_build() {
 	make all
-
-	rm -r etc/service.d/agetty-*
 }
 
 do_install() {
 	vlicense LICENSE
 
-	vcopy usr /
+	vcopy share /usr
 	vcopy etc /
 	vcopy bin /usr
 

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

* Re: [PR PATCH] [Updated] New package: fiss-0.1.1
  2023-05-07 23:22 [PR PATCH] " friedelschoen
  2023-05-08 20:50 ` [PR PATCH] [Updated] " friedelschoen
@ 2023-05-08 20:52 ` friedelschoen
  2023-05-08 21:30 ` friedelschoen
  2 siblings, 0 replies; 6+ messages in thread
From: friedelschoen @ 2023-05-08 20:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/friedelschoen/void-packages master
https://github.com/void-linux/void-packages/pull/43798

New package: fiss-0.1.1
The old request did not cross-compile and conflicts with `runit`/`runit-void`
- above packages are added to `removes`
- cross-compiling still failed by stripping the binaries

Anyways:
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - only x86_64-* works, as cross-compile-strip will fail (unrecognized file-format)

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

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

From 043af249e45f0237966766ed6495c9251048adc2 Mon Sep 17 00:00:00 2001
From: Friedel Schon <derfriedmundschoen@gmail.com>
Date: Sun, 30 Apr 2023 02:03:46 +0200
Subject: [PATCH 1/2] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
new file mode 100644
index 000000000000..e237ff5e4ee3
--- /dev/null
+++ b/srcpkgs/fiss/template
@@ -0,0 +1,28 @@
+# Template file for 'fiss'
+pkgname=fiss
+version=0.1.1
+revision=1
+short_desc="Friedel's Initialization and Service Supervision"
+maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
+license="Zlib"
+homepage="https://github.com/friedelschoen/fiss"
+distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
+checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+
+do_build() {
+	make all
+
+	rm -r etc/service.d/agetty-*
+}
+
+do_install() {
+	vlicense LICENSE
+
+	vcopy usr /
+	vcopy etc /
+	vcopy bin /usr
+
+	for f in man/*; do
+		vman $f
+	done
+}

From dc472d81f5c917f1b99b25bc51fe64819d62cc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Friedel=20Sch=C3=B6n?= <derfriedmundschoen@gmail.com>
Date: Mon, 8 May 2023 01:13:18 +0200
Subject: [PATCH 2/2] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
index e237ff5e4ee3..8f67c065d5a1 100644
--- a/srcpkgs/fiss/template
+++ b/srcpkgs/fiss/template
@@ -1,18 +1,19 @@
 # Template file for 'fiss'
 pkgname=fiss
 version=0.1.1
-revision=1
+revision=2
 short_desc="Friedel's Initialization and Service Supervision"
 maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
 license="Zlib"
 homepage="https://github.com/friedelschoen/fiss"
+#distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
 distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
-checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+checksum=6a745d950f726b4cb9b36b82951bed3818b4f23836d5782c5df1c4f70cf9c4f6
+conflicts="runit runit-void"
+nocross="https://github.com/void-linux/void-packages/actions/runs/4909831483/jobs/8784472571?pr=43798"
 
 do_build() {
 	make all
-
-	rm -r etc/service.d/agetty-*
 }
 
 do_install() {

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

* Re: [PR PATCH] [Updated] New package: fiss-0.1.1
  2023-05-07 23:22 [PR PATCH] " friedelschoen
@ 2023-05-08 20:50 ` friedelschoen
  2023-05-08 20:52 ` friedelschoen
  2023-05-08 21:30 ` friedelschoen
  2 siblings, 0 replies; 6+ messages in thread
From: friedelschoen @ 2023-05-08 20:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/friedelschoen/void-packages master
https://github.com/void-linux/void-packages/pull/43798

New package: fiss-0.1.1
The old request did not cross-compile and conflicts with `runit`/`runit-void`
- above packages are added to `removes`
- cross-compiling still failed by stripping the binaries

Anyways:
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - only x86_64-* works, as cross-compile-strip will fail (unrecognized file-format)

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

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

From 043af249e45f0237966766ed6495c9251048adc2 Mon Sep 17 00:00:00 2001
From: Friedel Schon <derfriedmundschoen@gmail.com>
Date: Sun, 30 Apr 2023 02:03:46 +0200
Subject: [PATCH 1/2] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
new file mode 100644
index 000000000000..e237ff5e4ee3
--- /dev/null
+++ b/srcpkgs/fiss/template
@@ -0,0 +1,28 @@
+# Template file for 'fiss'
+pkgname=fiss
+version=0.1.1
+revision=1
+short_desc="Friedel's Initialization and Service Supervision"
+maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
+license="Zlib"
+homepage="https://github.com/friedelschoen/fiss"
+distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
+checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+
+do_build() {
+	make all
+
+	rm -r etc/service.d/agetty-*
+}
+
+do_install() {
+	vlicense LICENSE
+
+	vcopy usr /
+	vcopy etc /
+	vcopy bin /usr
+
+	for f in man/*; do
+		vman $f
+	done
+}

From 5125b6072a7b3810ef63df1150e302973e53f71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Friedel=20Sch=C3=B6n?= <derfriedmundschoen@gmail.com>
Date: Mon, 8 May 2023 01:13:18 +0200
Subject: [PATCH 2/2] New package: fiss-0.1.1

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

diff --git a/srcpkgs/fiss/template b/srcpkgs/fiss/template
index e237ff5e4ee3..2c81e0a0e905 100644
--- a/srcpkgs/fiss/template
+++ b/srcpkgs/fiss/template
@@ -1,18 +1,19 @@
 # Template file for 'fiss'
 pkgname=fiss
 version=0.1.1
-revision=1
+revision=2
 short_desc="Friedel's Initialization and Service Supervision"
 maintainer="Friedel Schon <derfriedmundschoen@gmail.com>"
 license="Zlib"
 homepage="https://github.com/friedelschoen/fiss"
-distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
-checksum=0a9f26445a9d379d3ee4d753ae932a298754756f5e1c64712fd5f1750ac40ee4
+#distfiles="https://github.com/friedelschoen/fiss/archive/refs/tags/v$version.tar.gz"
+distfiles="http://localhost:8000/fiss.tar.gz"
+checksum=b79838e82b509e3ed73e28e731d3834d8af75329800733fefacf7cbabae6a613
+conflicts="runit runit-void"
+nocross="https://github.com/void-linux/void-packages/actions/runs/4909831483/jobs/8784472571?pr=43798"
 
 do_build() {
 	make all
-
-	rm -r etc/service.d/agetty-*
 }
 
 do_install() {

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

end of thread, other threads:[~2023-05-08 21:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-30  0:08 [PR PATCH] New package: fiss-0.1.1 friedelschoen
2023-05-07 23:13 ` [PR PATCH] [Updated] " friedelschoen
2023-05-07 23:16 ` [PR PATCH] [Closed]: " friedelschoen
2023-05-07 23:22 [PR PATCH] " friedelschoen
2023-05-08 20:50 ` [PR PATCH] [Updated] " friedelschoen
2023-05-08 20:52 ` friedelschoen
2023-05-08 21:30 ` friedelschoen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).